diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 6fc08d51f8..b447a81cda 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -58,12 +58,13 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 			$this->config,
 			$this->db,
 			$this->db_tools,
-			$this->extension_manager,
 			'phpbb_migrations',
 			dirname(__FILE__) . '/../../phpBB/',
 			'php',
-			'phpbb_', $tools
+			'phpbb_',
+			$tools
 		);
+		$this->migrator->set_extension_manager($this->extension_manager);
 	}
 
 	public function test_update()
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index e9db928997..3b81afc456 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -110,7 +110,6 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			$config,
 			$db,
 			$db_tools,
-			$manager,
 			'phpbb_migrations',
 			$phpbb_root_path,
 			$php_ext,
@@ -118,6 +117,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 			array()
 		);
 		$manager->set_migrator($migrator);
+		$migrator->set_extension_manager($manager);
 
 		return $manager;
 	}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index ff358033b1..3b9629b9f8 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -151,7 +151,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$config,
 			$db,
 			$db_tools,
-			$manager,
 			self::$config['table_prefix'] . 'migrations',
 			$phpbb_root_path,
 			$php_ext,
@@ -159,6 +158,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 			array()
 		);
 		$extension_manager->set_migrator($migrator);
+		$migrator->set_extension_manager($extension_manager);
 
 		return $extension_manager;
 	}