diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 46276bcfcb..15ab976b02 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -72,9 +72,16 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 				$classes = $finder->core_path('phpbb/')
 					->core_directory('/db/migration/data')
 					->set_extensions($setup_extensions)
-					->extension_directory('migrations')
+					->extension_directory('migration')
 					->get_classes();
 
+				// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
+				$classes_deprecated = $finder
+					->extension_directory('/migrations')
+					->get_classes();
+
+				$classes = array_merge($classes, $classes_deprecated);
+
 				$db = new \phpbb\db\driver\sqlite();
 				$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
 				$schema_data = $schema_generator->get_schema();