diff --git a/src/Tests/Condition/PhpConditionTest.php b/src/Tests/Condition/PhpConditionTest.php
index 9e7ea0f6944beb9c9058235a812510c9d3375505..96ad52b4ad7665524d7cb9101d6ac25e31774899 100644
--- a/src/Tests/Condition/PhpConditionTest.php
+++ b/src/Tests/Condition/PhpConditionTest.php
@@ -41,13 +41,13 @@ class PhpConditionTest extends KernelTestBase {
     // Grab the PHP condition and configure it to check against a php snippet.
     $condition = $this->manager->createInstance('php')
       ->setConfig('php', '<?php return TRUE; ?>');
-    $this->assertTrue($condition->execute(), 'PHP condition passes as expected.');
+    $this->assertTrue((bool) $condition->execute(), 'PHP condition passes as expected.');
     // Check for the proper summary.
     self::assertEquals($condition->summary(), 'When the given PHP evaluates as TRUE.');
 
     // Set the PHP snippet to return FALSE.
     $condition->setConfig('php', '<?php return FALSE; ?>');
-    $this->assertFalse($condition->execute(), 'PHP condition fails as expected.');
+    $this->assertFalse((bool) $condition->execute(), 'PHP condition fails as expected.');
 
     // Negate the condition.
     $condition->setConfig('negate', TRUE);
diff --git a/src/Tests/PhpAccessTest.php b/src/Tests/Functional/PhpAccessTest.php
similarity index 96%
rename from src/Tests/PhpAccessTest.php
rename to src/Tests/Functional/PhpAccessTest.php
index 8ed6d8532ffe63d940a0516c432750b97a9f0401..7fd9618168e4c82ca8183f6d0167f38a33cfa23d 100644
--- a/src/Tests/PhpAccessTest.php
+++ b/src/Tests/Functional/PhpAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\php\Tests;
+namespace Drupal\Tests\php\Functional;
 
 /**
  * Tests to make sure access to the PHP filter is properly restricted.
diff --git a/src/Tests/PhpFilterTest.php b/src/Tests/Functional/PhpFilterTest.php
similarity index 97%
rename from src/Tests/PhpFilterTest.php
rename to src/Tests/Functional/PhpFilterTest.php
index e9a51291af3768f29255a6e09eff8f451819ca2d..069f6dd2eea0295620d21baf097ad237a7db93dd 100644
--- a/src/Tests/PhpFilterTest.php
+++ b/src/Tests/Functional/PhpFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\php\Tests;
+namespace Drupal\Tests\php\Functional;
 
 /**
  * Tests to make sure the PHP filter actually evaluates PHP code when used.
diff --git a/src/Tests/PhpTestBase.php b/src/Tests/Functional/PhpTestBase.php
similarity index 94%
rename from src/Tests/PhpTestBase.php
rename to src/Tests/Functional/PhpTestBase.php
index 796d949a6f637d43c78cb49dff1bf47a150a45bc..da256e39f0842a0d4184fe861c6dccaa35c0faec 100644
--- a/src/Tests/PhpTestBase.php
+++ b/src/Tests/Functional/PhpTestBase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\php\Tests;
+namespace Drupal\Tests\php\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 use Drupal\user\RoleInterface;
 
 /**
@@ -10,7 +10,7 @@ use Drupal\user\RoleInterface;
  *
  * @group PHP
  */
-abstract class PhpTestBase extends WebTestBase {
+abstract class PhpTestBase extends BrowserTestBase {
 
   /**
    * Modules to enable.
diff --git a/src/Tests/PhpUninstallTest.php b/src/Tests/Functional/PhpUninstallTest.php
similarity index 90%
rename from src/Tests/PhpUninstallTest.php
rename to src/Tests/Functional/PhpUninstallTest.php
index d2bc5b01512d86ab32ca4353411a504547952263..589271decb574c7685724cf597350248d7991285 100644
--- a/src/Tests/PhpUninstallTest.php
+++ b/src/Tests/Functional/PhpUninstallTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\php\Tests;
+namespace Drupal\Tests\php\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test uninstall functionality of PHP module.
  *
  * @group PHP
  */
-class PhpUninstallTest extends WebTestBase {
+class PhpUninstallTest extends BrowserTestBase {
 
   /**
    * Modules to enable.