diff --git a/src/Tests/ExtlinkAdminTest.php b/src/Tests/ExtlinkAdminTest.php
deleted file mode 100644
index 7fbd0d7..0000000
--- a/src/Tests/ExtlinkAdminTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Drupal\extlink\Tests;
-
-/**
- * Testing of the External Links administration interface and functionality.
- *
- * @group Extlink Admin Tests
- */
-class ExtlinkAdminTest extends ExtlinkTestBase {
-
-  /**
-   * Test access to the admin pages.
-   */
-  public function testAdminAccess() {
-    $this->drupalLogin($this->normalUser);
-    $this->drupalGet(self::EXTLINK_ADMIN_PATH);
-    $this->assertText(t('Access denied'), 'Normal users should not be able to access the External Links admin pages', 'External Links');
-
-    $this->drupalLogin($this->adminUser);
-    $this->drupalGet(self::EXTLINK_ADMIN_PATH);
-    $this->assertNoText(t('Access denied'), 'Admin users should be able to access the External Links admin pages', 'External Links');
-  }
-
-}
diff --git a/src/Tests/ExtlinkTest.php b/src/Tests/ExtlinkTest.php
deleted file mode 100644
index d69f30b..0000000
--- a/src/Tests/ExtlinkTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Drupal\extlink\Tests;
-
-/**
- * Testing the basic functionality of External Links.
- *
- * @group Extlink
- */
-class ExtlinkTest extends ExtlinkTestBase {
-
-  /**
-   * Checks to see if we can get the front page.
-   */
-  public function testExtlinkOnFrontPage() {
-    // Get main page.
-    $this->drupalGet('');
-  }
-
-}
diff --git a/src/Tests/ExtlinkTestBase.php b/src/Tests/ExtlinkTestBase.php
deleted file mode 100644
index 9524e1a..0000000
--- a/src/Tests/ExtlinkTestBase.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Drupal\extlink\Tests;
-
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Base class for External Link tests.
- *
- * Provides common setup stuff and various helper functions.
- */
-abstract class ExtlinkTestBase extends WebTestBase {
-
-  public static $modules = array('extlink');
-
-  /**
-   * User with various administrative permissions.
-   *
-   * @var Drupaluser
-   */
-  protected $adminUser;
-
-  /**
-   * Normal visitor with limited permissions.
-   *
-   * @var Drupaluser
-   */
-  protected $normalUser;
-
-  /**
-   * Drupal path of the (general) External Links admin page.
-   */
-  const EXTLINK_ADMIN_PATH = 'admin/config/user-interface/extlink';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    // Enable any module that you will need in your tests.
-    parent::setUp();
-    // Create a normal user.
-    $permissions = array();
-    $this->normalUser = $this->drupalCreateUser($permissions);
-
-    // Create an admin user.
-    $permissions[] = 'administer site configuration';
-    $permissions[] = 'administer permissions';
-    $this->adminUser = $this->drupalCreateUser($permissions);
-  }
-
-  /**
-   * Get the nodes value.
-   */
-  protected function getNodeFormValues() {
-    $edit = array(
-      'title' => 'node_title ' . $this->randomName(32),
-      'body[' . LANGUAGE_NONE . '][0][value]' => 'node_body ' . $this->randomName(256) . ' <a href="http://google.com">Google!</a>',
-    );
-    return $edit;
-  }
-
-  /**
-   * Test if External Link is present.
-   */
-  protected function assertExternalLinkPresence() {
-    $elements = $this->xpath('//span[@class="ext"]');
-    if (count($elements) > 0) {
-      $this->pass('There should be an External Link on the form.', 'External Links');
-    }
-    else {
-      $this->fail('There should be an External Link on the form.', 'External Links');
-    }
-  }
-
-}
diff --git a/tests/src/FunctionalJavascript/ExtlinkAdminTest.php b/tests/src/FunctionalJavascript/ExtlinkAdminTest.php
index 6745230..75556cc 100644
--- a/tests/src/FunctionalJavascript/ExtlinkAdminTest.php
+++ b/tests/src/FunctionalJavascript/ExtlinkAdminTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\extlink\Functional;
+namespace Drupal\Tests\extlink\FunctionalJavascript;
 
 /**
  * Testing of the External Links administration interface and functionality.
diff --git a/tests/src/FunctionalJavascript/ExtlinkTest.php b/tests/src/FunctionalJavascript/ExtlinkTest.php
index 861d49f..5682f3b 100644
--- a/tests/src/FunctionalJavascript/ExtlinkTest.php
+++ b/tests/src/FunctionalJavascript/ExtlinkTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\extlink\Functional;
+namespace Drupal\Tests\extlink\FunctionalJavascript;
 
 /**
  * Testing the basic functionality of External Links.
diff --git a/tests/src/FunctionalJavascript/ExtlinkTestBase.php b/tests/src/FunctionalJavascript/ExtlinkTestBase.php
index 329b40e..2b43ecc 100644
--- a/tests/src/FunctionalJavascript/ExtlinkTestBase.php
+++ b/tests/src/FunctionalJavascript/ExtlinkTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\extlink\Functional;
+namespace Drupal\Tests\extlink\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
 
@@ -11,6 +11,9 @@ use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
  */
 abstract class ExtlinkTestBase extends JavascriptTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   public static $modules = ['extlink'];
 
   /**