diff --git a/testing_example/tests/src/Functional/NaiveConversionTest.php b/testing_example/tests/src/Functional/NaiveConversionTest.php
index 3a3b1e1..60be5ea 100644
--- a/testing_example/tests/src/Functional/NaiveConversionTest.php
+++ b/testing_example/tests/src/Functional/NaiveConversionTest.php
@@ -1,20 +1,17 @@
 <?php
 // @codingStandardsIgnoreFile
 
-// Move this file to testing_example/tests/src/Functional/.
+namespace Drupal\testing_example\Functional;
 
-// Change this namespace to Drupal\Tests\testing_example\Functional.
-namespace Drupal\testing_example\Tests;
-
-// Change this to use Drupal\Tests\BrowserTestBase.
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
- * Change this class declaration so it extends BrowserTestBase.
+ * Class NaiveConversionTest
  *
+ * @package Drupal\testing_example\Functional
  * @group testing_example
  */
-class NaiveConversionTest extends WebTestBase {
+class NaiveConversionTest extends BrowserTestBase {
 
   /**
    * A very basic passing test method that requires no further conversion.
diff --git a/testing_example/tests/src/Functional/SimpleTestExampleMockModuleTest.php b/testing_example/tests/src/Functional/SimpleTestExampleMockModuleTest.php
index 3e8a9e7..659eeb2 100644
--- a/testing_example/tests/src/Functional/SimpleTestExampleMockModuleTest.php
+++ b/testing_example/tests/src/Functional/SimpleTestExampleMockModuleTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\testing_example\Tests;
+namespace Drupal\testing_example\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Demonstrate SimpleTest with a mock module.
@@ -29,7 +29,7 @@ use Drupal\simpletest\WebTestBase;
  * @group testing_example
  * @group examples
  */
-class SimpleTestExampleMockModuleTest extends WebTestBase {
+class SimpleTestExampleMockModuleTest extends BrowserTestBase {
 
   /**
    * Our module dependencies.
diff --git a/testing_example/tests/src/Functional/SimpleTestExampleTest.php b/testing_example/tests/src/Functional/SimpleTestExampleTest.php
index 4be2573..cd07e47 100644
--- a/testing_example/tests/src/Functional/SimpleTestExampleTest.php
+++ b/testing_example/tests/src/Functional/SimpleTestExampleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\testing_example\Tests;
+namespace Drupal\testing_example\Functional;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;