diff --git a/templates/bake/Plugin/phpunit.xml.dist.twig b/templates/bake/Plugin/phpunit.xml.dist.twig
index 3736109e..a9f75563 100644
--- a/templates/bake/Plugin/phpunit.xml.dist.twig
+++ b/templates/bake/Plugin/phpunit.xml.dist.twig
@@ -34,7 +34,7 @@
 
     <!-- Setup fixture extension -->
     <extensions>
-        <extension class="Cake\TestSuite\Fixtures\PHPUnitExtension" />
+        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension" />
     </extensions>
 
     <filter>
diff --git a/templates/bake/Plugin/tests/bootstrap.php.twig b/templates/bake/Plugin/tests/bootstrap.php.twig
index 07b207ba..bfb1dadc 100644
--- a/templates/bake/Plugin/tests/bootstrap.php.twig
+++ b/templates/bake/Plugin/tests/bootstrap.php.twig
@@ -34,7 +34,7 @@ $findRoot = function ($root) {
         }
     } while ($root !== $lastRoot);
 
-    throw new Exception("Cannot find the root of the application, unable to run tests");
+    throw new Exception('Cannot find the root of the application, unable to run tests');
 };
 $root = $findRoot(__FILE__);
 unset($findRoot);
@@ -66,7 +66,7 @@ if (file_exists($root . '/config/bootstrap.php')) {
  * using migrations to provide schema for your plugin,
  * and using \Migrations\TestSuite\Migrator to load schema.
  */
-use Cake\TestSuite\Schema\SchemaManager;
+use Cake\TestSuite\Fixture\SchemaLoader;
 
 // Load a schema dump file.
-SchemaManager::create('test', 'tests/schema.sql');
+(new SchemaLoader())->loadSqlFiles('tests/schema.sql', 'test');
diff --git a/tests/comparisons/Plugin/Company/Example/phpunit.xml.dist b/tests/comparisons/Plugin/Company/Example/phpunit.xml.dist
index 9ed38ac9..5cbafd47 100644
--- a/tests/comparisons/Plugin/Company/Example/phpunit.xml.dist
+++ b/tests/comparisons/Plugin/Company/Example/phpunit.xml.dist
@@ -19,7 +19,7 @@
 
     <!-- Setup fixture extension -->
     <extensions>
-        <extension class="Cake\TestSuite\Fixtures\PHPUnitExtension" />
+        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension" />
     </extensions>
 
     <filter>
diff --git a/tests/comparisons/Plugin/Company/Example/tests/bootstrap.php b/tests/comparisons/Plugin/Company/Example/tests/bootstrap.php
index d3d6d75c..401fcb40 100644
--- a/tests/comparisons/Plugin/Company/Example/tests/bootstrap.php
+++ b/tests/comparisons/Plugin/Company/Example/tests/bootstrap.php
@@ -17,7 +17,7 @@
         }
     } while ($root !== $lastRoot);
 
-    throw new Exception("Cannot find the root of the application, unable to run tests");
+    throw new Exception('Cannot find the root of the application, unable to run tests');
 };
 $root = $findRoot(__FILE__);
 unset($findRoot);
@@ -49,7 +49,7 @@
  * using migrations to provide schema for your plugin,
  * and using \Migrations\TestSuite\Migrator to load schema.
  */
-use Cake\TestSuite\Schema\SchemaManager;
+use Cake\TestSuite\Fixture\SchemaLoader;
 
 // Load a schema dump file.
-SchemaManager::create('test', 'tests/schema.sql');
+(new SchemaLoader())->loadSqlFiles('tests/schema.sql', 'test');
diff --git a/tests/comparisons/Plugin/SimpleExample/phpunit.xml.dist b/tests/comparisons/Plugin/SimpleExample/phpunit.xml.dist
index d9885c3a..4aa48fb4 100644
--- a/tests/comparisons/Plugin/SimpleExample/phpunit.xml.dist
+++ b/tests/comparisons/Plugin/SimpleExample/phpunit.xml.dist
@@ -19,7 +19,7 @@
 
     <!-- Setup fixture extension -->
     <extensions>
-        <extension class="Cake\TestSuite\Fixtures\PHPUnitExtension" />
+        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension" />
     </extensions>
 
     <filter>
diff --git a/tests/comparisons/Plugin/SimpleExample/tests/bootstrap.php b/tests/comparisons/Plugin/SimpleExample/tests/bootstrap.php
index 5f8949b0..445c88c0 100644
--- a/tests/comparisons/Plugin/SimpleExample/tests/bootstrap.php
+++ b/tests/comparisons/Plugin/SimpleExample/tests/bootstrap.php
@@ -17,7 +17,7 @@
         }
     } while ($root !== $lastRoot);
 
-    throw new Exception("Cannot find the root of the application, unable to run tests");
+    throw new Exception('Cannot find the root of the application, unable to run tests');
 };
 $root = $findRoot(__FILE__);
 unset($findRoot);
@@ -49,7 +49,7 @@
  * using migrations to provide schema for your plugin,
  * and using \Migrations\TestSuite\Migrator to load schema.
  */
-use Cake\TestSuite\Schema\SchemaManager;
+use Cake\TestSuite\Fixture\SchemaLoader;
 
 // Load a schema dump file.
-SchemaManager::create('test', 'tests/schema.sql');
+(new SchemaLoader())->loadSqlFiles('tests/schema.sql', 'test');