diff --git a/composer.json b/composer.json
index 2cbadf8..4c62f35 100644
--- a/composer.json
+++ b/composer.json
@@ -29,5 +29,11 @@
         "psr-4": {
             "ArrayAccess\\DnsRecord\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ArrayAccess\\DnsRecord\\": "src/",
+            "Tests\\ArrayAccess\\DnsRecord\\": "tests/"
+        }
     }
 }
diff --git a/tests/ArrayAccess/DnsRecord/Tests/Cache/CacheStorageTest.php b/tests/Cache/CacheStorageTest.php
similarity index 99%
rename from tests/ArrayAccess/DnsRecord/Tests/Cache/CacheStorageTest.php
rename to tests/Cache/CacheStorageTest.php
index 3c7d585..7b12ca8 100644
--- a/tests/ArrayAccess/DnsRecord/Tests/Cache/CacheStorageTest.php
+++ b/tests/Cache/CacheStorageTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ArrayAccess\DnsRecord\Tests\Cache;
+namespace Tests\ArrayAccess\DnsRecord\Cache;
 
 use ArrayAccess\DnsRecord\Cache\Adapter\ArrayCacheAdapter;
 use ArrayAccess\DnsRecord\Cache\CacheStorage;
diff --git a/tests/DNSClientPhpVersionTest.php b/tests/DNSClientPhpVersionTest.php
deleted file mode 100644
index 48c1436..0000000
--- a/tests/DNSClientPhpVersionTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace {
-
-    use PHPUnit\Framework\TestCase;
-
-    class DNSClientPhpVersionTest extends TestCase
-    {
-        public function testPhpVersion()
-        {
-            $this->assertTrue(
-                version_compare(phpversion(), '8.1', '>='),
-                sprintf(
-                    'Php version should greater than %s',
-                    '8.1'
-                )
-            );
-        }
-    }
-}
diff --git a/tests/ArrayAccess/DnsRecord/Tests/DnsServerStorageTest.php b/tests/DnsServerStorageTest.php
similarity index 99%
rename from tests/ArrayAccess/DnsRecord/Tests/DnsServerStorageTest.php
rename to tests/DnsServerStorageTest.php
index b5ce217..e56aadc 100644
--- a/tests/ArrayAccess/DnsRecord/Tests/DnsServerStorageTest.php
+++ b/tests/DnsServerStorageTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ArrayAccess\DnsRecord\Tests;
+namespace Tests\ArrayAccess\DnsRecord;
 
 use ArrayAccess\DnsRecord\DnsServer\CustomDnsServer;
 use ArrayAccess\DnsRecord\DnsServer\Google;