diff --git a/src/Tests/WebformElementAccessTest.php b/src/Tests/Element/WebformElementAccessTest.php
similarity index 98%
rename from src/Tests/WebformElementAccessTest.php
rename to src/Tests/Element/WebformElementAccessTest.php
index 44d502c3..1e2ad389 100644
--- a/src/Tests/WebformElementAccessTest.php
+++ b/src/Tests/Element/WebformElementAccessTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for webform element access.
diff --git a/src/Tests/WebformElementAttributesTest.php b/src/Tests/Element/WebformElementAttributesTest.php
similarity index 93%
rename from src/Tests/WebformElementAttributesTest.php
rename to src/Tests/Element/WebformElementAttributesTest.php
index 141cb6e4..ab040307 100644
--- a/src/Tests/WebformElementAttributesTest.php
+++ b/src/Tests/Element/WebformElementAttributesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementCodeMirrorTest.php b/src/Tests/Element/WebformElementCodeMirrorTest.php
similarity index 98%
rename from src/Tests/WebformElementCodeMirrorTest.php
rename to src/Tests/Element/WebformElementCodeMirrorTest.php
index f34b3cfd..371da27a 100644
--- a/src/Tests/WebformElementCodeMirrorTest.php
+++ b/src/Tests/Element/WebformElementCodeMirrorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementCustomPropertiesTest.php b/src/Tests/Element/WebformElementCustomPropertiesTest.php
similarity index 98%
rename from src/Tests/WebformElementCustomPropertiesTest.php
rename to src/Tests/Element/WebformElementCustomPropertiesTest.php
index 6e339468..7a1832ac 100644
--- a/src/Tests/WebformElementCustomPropertiesTest.php
+++ b/src/Tests/Element/WebformElementCustomPropertiesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementDateTest.php b/src/Tests/Element/WebformElementDateTest.php
similarity index 99%
rename from src/Tests/WebformElementDateTest.php
rename to src/Tests/Element/WebformElementDateTest.php
index 83e164dc..83a3df13 100644
--- a/src/Tests/WebformElementDateTest.php
+++ b/src/Tests/Element/WebformElementDateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\simpletest\WebTestBase;
diff --git a/src/Tests/WebformElementExtrasTest.php b/src/Tests/Element/WebformElementExtrasTest.php
similarity index 99%
rename from src/Tests/WebformElementExtrasTest.php
rename to src/Tests/Element/WebformElementExtrasTest.php
index cbb0ca48..56184161 100644
--- a/src/Tests/WebformElementExtrasTest.php
+++ b/src/Tests/Element/WebformElementExtrasTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementFormatTest.php b/src/Tests/Element/WebformElementFormatTest.php
similarity index 99%
rename from src/Tests/WebformElementFormatTest.php
rename to src/Tests/Element/WebformElementFormatTest.php
index f9e9ab59..bfae9413 100644
--- a/src/Tests/WebformElementFormatTest.php
+++ b/src/Tests/Element/WebformElementFormatTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\user\Entity\User;
 use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\Tests\WebformTestBase;
 use Drupal\webform\WebformSubmissionInterface;
 
 /**
diff --git a/src/Tests/WebformElementLikertTest.php b/src/Tests/Element/WebformElementLikertTest.php
similarity index 98%
rename from src/Tests/WebformElementLikertTest.php
rename to src/Tests/Element/WebformElementLikertTest.php
index 4edcab27..3f61b442 100644
--- a/src/Tests/WebformElementLikertTest.php
+++ b/src/Tests/Element/WebformElementLikertTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementManagedFilePublicTest.php b/src/Tests/Element/WebformElementManagedFilePublicTest.php
similarity index 97%
rename from src/Tests/WebformElementManagedFilePublicTest.php
rename to src/Tests/Element/WebformElementManagedFilePublicTest.php
index 6b85c196..c65bd46c 100644
--- a/src/Tests/WebformElementManagedFilePublicTest.php
+++ b/src/Tests/Element/WebformElementManagedFilePublicTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
+
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Test for webform element managed public file handling (DRUPAL-PSA-2016-003).
diff --git a/src/Tests/WebformElementManagedFileTest.php b/src/Tests/Element/WebformElementManagedFileTest.php
similarity index 99%
rename from src/Tests/WebformElementManagedFileTest.php
rename to src/Tests/Element/WebformElementManagedFileTest.php
index 977d8b23..e5bc8d5f 100644
--- a/src/Tests/WebformElementManagedFileTest.php
+++ b/src/Tests/Element/WebformElementManagedFileTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\file\Entity\File;
 use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Test for webform element managed file handling.
diff --git a/src/Tests/WebformElementMessageTest.php b/src/Tests/Element/WebformElementMessageTest.php
similarity index 98%
rename from src/Tests/WebformElementMessageTest.php
rename to src/Tests/Element/WebformElementMessageTest.php
index bd001aa4..90d45df4 100644
--- a/src/Tests/WebformElementMessageTest.php
+++ b/src/Tests/Element/WebformElementMessageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 use Drupal\webform\Entity\Webform;
diff --git a/src/Tests/WebformElementMultipleTest.php b/src/Tests/Element/WebformElementMultipleTest.php
similarity index 99%
rename from src/Tests/WebformElementMultipleTest.php
rename to src/Tests/Element/WebformElementMultipleTest.php
index a544ff48..e7e887cd 100644
--- a/src/Tests/WebformElementMultipleTest.php
+++ b/src/Tests/Element/WebformElementMultipleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementOptionsTest.php b/src/Tests/Element/WebformElementOptionsTest.php
similarity index 96%
rename from src/Tests/WebformElementOptionsTest.php
rename to src/Tests/Element/WebformElementOptionsTest.php
index 85006e7b..1534e691 100644
--- a/src/Tests/WebformElementOptionsTest.php
+++ b/src/Tests/Element/WebformElementOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformElementOtherTest.php b/src/Tests/Element/WebformElementOtherTest.php
similarity index 99%
rename from src/Tests/WebformElementOtherTest.php
rename to src/Tests/Element/WebformElementOtherTest.php
index aaebf6bf..97c26d1f 100644
--- a/src/Tests/WebformElementOtherTest.php
+++ b/src/Tests/Element/WebformElementOtherTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 use Drupal\webform\Entity\Webform;
diff --git a/src/Tests/WebformElementPluginTest.php b/src/Tests/Element/WebformElementPluginTest.php
similarity index 97%
rename from src/Tests/WebformElementPluginTest.php
rename to src/Tests/Element/WebformElementPluginTest.php
index 324273a4..9a4e9294 100644
--- a/src/Tests/WebformElementPluginTest.php
+++ b/src/Tests/Element/WebformElementPluginTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for the webform element plugin.
diff --git a/src/Tests/WebformElementStatesTest.php b/src/Tests/Element/WebformElementStatesTest.php
similarity index 99%
rename from src/Tests/WebformElementStatesTest.php
rename to src/Tests/Element/WebformElementStatesTest.php
index cfec6fbc..6bf7fd32 100644
--- a/src/Tests/WebformElementStatesTest.php
+++ b/src/Tests/Element/WebformElementStatesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\Core\Form\OptGroup;
 use Drupal\simpletest\WebTestBase;
diff --git a/src/Tests/WebformElementTableTest.php b/src/Tests/Element/WebformElementTableTest.php
similarity index 97%
rename from src/Tests/WebformElementTableTest.php
rename to src/Tests/Element/WebformElementTableTest.php
index 66da7957..612d5327 100644
--- a/src/Tests/WebformElementTableTest.php
+++ b/src/Tests/Element/WebformElementTableTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\webform\Entity\Webform;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for table elements.
diff --git a/src/Tests/WebformElementTest.php b/src/Tests/Element/WebformElementTest.php
similarity index 96%
rename from src/Tests/WebformElementTest.php
rename to src/Tests/Element/WebformElementTest.php
index 46792fa6..ebdd7108 100644
--- a/src/Tests/WebformElementTest.php
+++ b/src/Tests/Element/WebformElementTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Element;
 
 use Drupal\simpletest\WebTestBase;
 
diff --git a/src/Tests/WebformHandlerEmailAdvancedTest.php b/src/Tests/Handler/WebformHandlerEmailAdvancedTest.php
similarity index 98%
rename from src/Tests/WebformHandlerEmailAdvancedTest.php
rename to src/Tests/Handler/WebformHandlerEmailAdvancedTest.php
index 6d768426..57349fe2 100644
--- a/src/Tests/WebformHandlerEmailAdvancedTest.php
+++ b/src/Tests/Handler/WebformHandlerEmailAdvancedTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Handler;
 
 use Drupal\webform\Entity\Webform;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for advanced email webform handler functionality with HTML and attachments.
diff --git a/src/Tests/WebformHandlerEmailBasicTest.php b/src/Tests/Handler/WebformHandlerEmailBasicTest.php
similarity index 97%
rename from src/Tests/WebformHandlerEmailBasicTest.php
rename to src/Tests/Handler/WebformHandlerEmailBasicTest.php
index 42a498bb..0dfa0c95 100644
--- a/src/Tests/WebformHandlerEmailBasicTest.php
+++ b/src/Tests/Handler/WebformHandlerEmailBasicTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Handler;
 
 use Drupal\webform\Element\WebformSelectOther;
 use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for basic email webform handler functionality.
diff --git a/src/Tests/WebformHandlerPluginTest.php b/src/Tests/Handler/WebformHandlerPluginTest.php
similarity index 97%
rename from src/Tests/WebformHandlerPluginTest.php
rename to src/Tests/Handler/WebformHandlerPluginTest.php
index 4a1bf3c9..39acbf9b 100644
--- a/src/Tests/WebformHandlerPluginTest.php
+++ b/src/Tests/Handler/WebformHandlerPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Handler;
 
 use Drupal\simpletest\WebTestBase;
 use Drupal\webform\Entity\Webform;
diff --git a/src/Tests/WebformHandlerRemotePostTest.php b/src/Tests/Handler/WebformHandlerRemotePostTest.php
similarity index 97%
rename from src/Tests/WebformHandlerRemotePostTest.php
rename to src/Tests/Handler/WebformHandlerRemotePostTest.php
index 7c56b0ac..6737205b 100644
--- a/src/Tests/WebformHandlerRemotePostTest.php
+++ b/src/Tests/Handler/WebformHandlerRemotePostTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Handler;
 
 use Drupal\webform\Entity\Webform;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for remote post webform handler functionality.
diff --git a/src/Tests/WebformHandlerTest.php b/src/Tests/Handler/WebformHandlerTest.php
similarity index 99%
rename from src/Tests/WebformHandlerTest.php
rename to src/Tests/Handler/WebformHandlerTest.php
index 6c8e404a..5c266079 100644
--- a/src/Tests/WebformHandlerTest.php
+++ b/src/Tests/Handler/WebformHandlerTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Drupal\webform\Tests;
+namespace Drupal\webform\Tests\Handler;
 
 use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\Tests\WebformTestBase;
 
 /**
  * Tests for webform handler plugin.