diff --git a/geshifield/tests/src/Functional/GeshiFieldTest.php b/geshifield/tests/src/Functional/GeshiFieldTest.php
index 83ba656..ad8a15c 100644
--- a/geshifield/tests/src/Functional/GeshiFieldTest.php
+++ b/geshifield/tests/src/Functional/GeshiFieldTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\geshifield\Tests;
+namespace Drupal\Tests\geshifield\Functional;
 
 use Drupal\geshifilter\GeshiFilter;
 
 // Use of base class for the tests.
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for GeshiField in node content.
@@ -15,7 +15,7 @@ use Drupal\simpletest\WebTestBase;
  *
  * @group geshifilter
  */
-class GeshiFieldTest extends WebTestBase {
+class GeshiFieldTest extends BrowserTestBase {
 
   /**
    * A global filter adminstrator.
diff --git a/tests/src/Functional/GeshiFilterAdministrationTest.php b/tests/src/Functional/GeshiFilterAdministrationTest.php
index b584f69..d76d7d2 100644
--- a/tests/src/Functional/GeshiFilterAdministrationTest.php
+++ b/tests/src/Functional/GeshiFilterAdministrationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\geshifilter\Tests;
+namespace Drupal\Tests\geshifilter\Functional;
 
 // Use of base class for the tests.
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 use Drupal\geshifilter\GeshiFilter;
 
@@ -12,7 +12,7 @@ use Drupal\geshifilter\GeshiFilter;
  *
  * @group geshifilter
  */
-class GeshiFilterAdministrationTest extends WebTestBase {
+class GeshiFilterAdministrationTest extends BrowserTestBase {
 
   /**
    * A global filter adminstrator.
diff --git a/tests/src/Functional/GeshiFilterCssTest.php b/tests/src/Functional/GeshiFilterCssTest.php
index 016de90..1d6a861 100644
--- a/tests/src/Functional/GeshiFilterCssTest.php
+++ b/tests/src/Functional/GeshiFilterCssTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\geshifilter\Tests;
+namespace Drupal\Tests\geshifilter\Functional;
 
 // Use of base class for the tests.
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test for css generation and use in GeshiFilter.
  *
  * @group geshifilter
  */
-class GeshiFilterCssTest extends WebTestBase {
+class GeshiFilterCssTest extends BrowserTestBase {
 
   /**
    * A global filter adminstrator.
diff --git a/tests/src/Functional/GeshiFilterTest.php b/tests/src/Functional/GeshiFilterTest.php
index fe283d9..a34ed61 100644
--- a/tests/src/Functional/GeshiFilterTest.php
+++ b/tests/src/Functional/GeshiFilterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\geshifilter\Tests;
+namespace Drupal\Tests\geshifilter\Functional;
 
 // Use of base class for the tests.
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 use Drupal\geshifilter\GeshiFilter;
 
@@ -17,7 +17,7 @@ use Drupal\geshifilter\GeshiFilterProcess;
  *
  * @group geshifilter
  */
-class GeshiFilterTest extends WebTestBase {
+class GeshiFilterTest extends BrowserTestBase {
 
   /**
    * A global filter adminstrator.