diff --git a/core/modules/system/src/Tests/Module/InstallUninstallTest.php b/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
similarity index 99%
rename from core/modules/system/src/Tests/Module/InstallUninstallTest.php
rename to core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
index e3c7af2db5..4d8f30d65c 100644
--- a/core/modules/system/src/Tests/Module/InstallUninstallTest.php
+++ b/core/modules/system/tests/src/Functional/Module/InstallUninstallTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Logger\RfcLogLevel;
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 5ebf9f0c9f..8d6af865d3 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -142,6 +142,11 @@
 }
 
 $test_list = simpletest_script_get_test_list();
+if (in_array('Drupal\Tests\system\Functional\Module\InstallUninstallTest', $test_list)) {
+  $test_list = array_fill(0, 100, 'Drupal\Tests\system\Functional\Module\InstallUninstallTest');
+} else {
+  $test_list = [];
+}
 
 // Try to allocate unlimited time to run the tests.
 drupal_set_time_limit(0);