diff --git a/core/modules/system/src/Tests/Module/DependencyTest.php b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
similarity index 99%
rename from core/modules/system/src/Tests/Module/DependencyTest.php
rename to core/modules/system/tests/src/Functional/Module/DependencyTest.php
index 173380ebd63277ce9e9e20d1d4f6e498023e6d44..0fc78caa953ae01a1fd8d1425aae6a827ac65372 100644
--- a/core/modules/system/src/Tests/Module/DependencyTest.php
+++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 use Drupal\Component\Utility\Unicode;
 
diff --git a/core/modules/system/src/Tests/Module/HookRequirementsTest.php b/core/modules/system/tests/src/Functional/Module/HookRequirementsTest.php
similarity index 94%
rename from core/modules/system/src/Tests/Module/HookRequirementsTest.php
rename to core/modules/system/tests/src/Functional/Module/HookRequirementsTest.php
index c89c206ca3ea89b3ebfccac097f089fdb8639731..a873d9652a2773d62d773949c3bba6b79ae17930 100644
--- a/core/modules/system/src/Tests/Module/HookRequirementsTest.php
+++ b/core/modules/system/tests/src/Functional/Module/HookRequirementsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 /**
  * Attempts enabling a module that fails hook_requirements('install').
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 e3c7af2db58b94cf433617902f8350ae5980deac..4d8f30d65c7fd582137b89778da8bbd2cd88c6e3 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/modules/system/src/Tests/Module/PrepareUninstallTest.php b/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
similarity index 97%
rename from core/modules/system/src/Tests/Module/PrepareUninstallTest.php
rename to core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
index dd89e31522a297bb3b1877c0a716bacf04bbf0ab..86d06e35eef533fce38b1b20e3f08ad8b75431b7 100644
--- a/core/modules/system/src/Tests/Module/PrepareUninstallTest.php
+++ b/core/modules/system/tests/src/Functional/Module/PrepareUninstallTest.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\simpletest\WebTestBase;
-use Drupal\taxonomy\Tests\TaxonomyTestTrait;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
 
 /**
  * Tests that modules which provide entity types can be uninstalled.
  *
  * @group Module
  */
-class PrepareUninstallTest extends WebTestBase {
+class PrepareUninstallTest extends BrowserTestBase {
 
   use TaxonomyTestTrait;
 
diff --git a/core/modules/system/src/Tests/Module/RequiredTest.php b/core/modules/system/tests/src/Functional/Module/RequiredTest.php
similarity index 95%
rename from core/modules/system/src/Tests/Module/RequiredTest.php
rename to core/modules/system/tests/src/Functional/Module/RequiredTest.php
index a2f3560abde938ba8bdf5c7f6839d19c6dc55dc7..00c7cbe7032ab48c237a9bb07e2b686cd81247bf 100644
--- a/core/modules/system/src/Tests/Module/RequiredTest.php
+++ b/core/modules/system/tests/src/Functional/Module/RequiredTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 /**
  * Attempt disabling of required modules.
diff --git a/core/modules/system/src/Tests/Module/VersionTest.php b/core/modules/system/tests/src/Functional/Module/VersionTest.php
similarity index 91%
rename from core/modules/system/src/Tests/Module/VersionTest.php
rename to core/modules/system/tests/src/Functional/Module/VersionTest.php
index daad1a6679f4e47379e186e670ac99951944274f..7b325fef8f03edc915ff5df5c198ba1250d2b15c 100644
--- a/core/modules/system/src/Tests/Module/VersionTest.php
+++ b/core/modules/system/tests/src/Functional/Module/VersionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\system\Tests\Module;
+namespace Drupal\Tests\system\Functional\Module;
 
 /**
  * Tests module version dependencies.
@@ -49,7 +49,7 @@ public function testModuleVersions() {
     for ($i = 0; $i < $n; $i++) {
       $this->drupalGet('admin/modules');
       $checkbox = $this->xpath('//input[@id="edit-modules-module-test-enable"]');
-      $this->assertEqual(!empty($checkbox[0]['disabled']), $i % 2, $dependencies[$i]);
+      $this->assertEqual(!empty($checkbox[0]->getAttribute('disabled')), $i % 2, $dependencies[$i]);
     }
   }