diff --git a/composer.json b/composer.json
index ee82b87..dc738e1 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "StellarWP\\SuperGlobals\\Tests\\": "tests/_support/",
-      "StellarWP\\SuperGlobals\\Tests\\Helper\\": "tests/_support/Helper/"
+      "StellarWP\\SuperGlobals\\Tests\\": "tests/"
     }
   },
   "authors": [
diff --git a/phpunit.xml b/phpunit.xml
index a3d4062..27257bd 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" colors="true" cacheResultFile="tests/var/cache/.phpunit.result.cache">
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">vendor</directory>
-    </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="unit">
-      <directory suffix="Test.php">tests/unit</directory>
-    </testsuite>
-  </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+		 bootstrap="tests/bootstrap.php"
+		 colors="true"
+		 cacheResultFile="tests/var/cache/.phpunit.result.cache">
+	<coverage>
+		<include>
+			<directory suffix=".php">src</directory>
+		</include>
+		<exclude>
+			<directory suffix=".php">vendor</directory>
+		</exclude>
+	</coverage>
+	<testsuites>
+		<testsuite name="Unit">
+			<directory suffix="Test.php">tests/Unit</directory>
+		</testsuite>
+	</testsuites>
 </phpunit>
diff --git a/tests/unit/SuperGlobalsTest.php b/tests/Unit/SuperGlobalsTest.php
similarity index 98%
rename from tests/unit/SuperGlobalsTest.php
rename to tests/Unit/SuperGlobalsTest.php
index f27b5f0..c5b9e7a 100644
--- a/tests/unit/SuperGlobalsTest.php
+++ b/tests/Unit/SuperGlobalsTest.php
@@ -1,10 +1,11 @@
 <?php
-namespace StellarWP\SuperGlobals\Tests;
+
+namespace StellarWP\SuperGlobals\Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
 use StellarWP\SuperGlobals\SuperGlobals;
 
-class SuperGlobalsTest extends TestCase {
+final class SuperGlobalsTest extends TestCase {
 	/**
 	 * @test
 	 */
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index de6ff4e..a4abe2d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,3 +1,2 @@
 <?php
 
-require_once __DIR__ . '/TestCase.php';