diff --git a/composer.json b/composer.json
index 23e7f0f..678b01a 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
         "psr-4": {"Ramsey\\Uuid\\": "src/"}
     },
     "autoload-dev": {
-        "psr-4": {"Ramsey\\Uuid\\Test\\": "tests/src/"}
+        "psr-4": {"Ramsey\\Uuid\\Test\\": "tests/"}
     },
     "replace": {
         "rhumsaa/uuid": "self.version"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1630f01..0524781 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,7 +4,7 @@
          backupGlobals="false">
     <testsuites>
         <testsuite>
-            <directory>./tests/src</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <filter>
diff --git a/tests/src/Builder/DefaultUuidBuilderTest.php b/tests/Builder/DefaultUuidBuilderTest.php
similarity index 100%
rename from tests/src/Builder/DefaultUuidBuilderTest.php
rename to tests/Builder/DefaultUuidBuilderTest.php
diff --git a/tests/src/Builder/DegradedUuidBuilderTest.php b/tests/Builder/DegradedUuidBuilderTest.php
similarity index 100%
rename from tests/src/Builder/DegradedUuidBuilderTest.php
rename to tests/Builder/DegradedUuidBuilderTest.php
diff --git a/tests/src/Codec/GuidStringCodecTest.php b/tests/Codec/GuidStringCodecTest.php
similarity index 100%
rename from tests/src/Codec/GuidStringCodecTest.php
rename to tests/Codec/GuidStringCodecTest.php
diff --git a/tests/src/Codec/OrderedTimeCodecTest.php b/tests/Codec/OrderedTimeCodecTest.php
similarity index 100%
rename from tests/src/Codec/OrderedTimeCodecTest.php
rename to tests/Codec/OrderedTimeCodecTest.php
diff --git a/tests/src/Codec/StringCodecTest.php b/tests/Codec/StringCodecTest.php
similarity index 100%
rename from tests/src/Codec/StringCodecTest.php
rename to tests/Codec/StringCodecTest.php
diff --git a/tests/src/Converter/Number/DegradedNumberConverterTest.php b/tests/Converter/Number/DegradedNumberConverterTest.php
similarity index 100%
rename from tests/src/Converter/Number/DegradedNumberConverterTest.php
rename to tests/Converter/Number/DegradedNumberConverterTest.php
diff --git a/tests/src/Converter/Time/PhpTimeConverterTest.php b/tests/Converter/Time/PhpTimeConverterTest.php
similarity index 100%
rename from tests/src/Converter/Time/PhpTimeConverterTest.php
rename to tests/Converter/Time/PhpTimeConverterTest.php
diff --git a/tests/src/Encoder/TimestampFirstCombCodecTest.php b/tests/Encoder/TimestampFirstCombCodecTest.php
similarity index 100%
rename from tests/src/Encoder/TimestampFirstCombCodecTest.php
rename to tests/Encoder/TimestampFirstCombCodecTest.php
diff --git a/tests/src/Encoder/TimestampLastCombCodecTest.php b/tests/Encoder/TimestampLastCombCodecTest.php
similarity index 100%
rename from tests/src/Encoder/TimestampLastCombCodecTest.php
rename to tests/Encoder/TimestampLastCombCodecTest.php
diff --git a/tests/src/Generator/CombGeneratorTest.php b/tests/Generator/CombGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/CombGeneratorTest.php
rename to tests/Generator/CombGeneratorTest.php
diff --git a/tests/src/Generator/DefaultTimeGeneratorTest.php b/tests/Generator/DefaultTimeGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/DefaultTimeGeneratorTest.php
rename to tests/Generator/DefaultTimeGeneratorTest.php
diff --git a/tests/src/Generator/MtRandGeneratorTest.php b/tests/Generator/MtRandGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/MtRandGeneratorTest.php
rename to tests/Generator/MtRandGeneratorTest.php
diff --git a/tests/src/Generator/OpenSslGeneratorTest.php b/tests/Generator/OpenSslGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/OpenSslGeneratorTest.php
rename to tests/Generator/OpenSslGeneratorTest.php
diff --git a/tests/src/Generator/PeclUuidRandomGeneratorTest.php b/tests/Generator/PeclUuidRandomGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/PeclUuidRandomGeneratorTest.php
rename to tests/Generator/PeclUuidRandomGeneratorTest.php
diff --git a/tests/src/Generator/PeclUuidTestCase.php b/tests/Generator/PeclUuidTestCase.php
similarity index 100%
rename from tests/src/Generator/PeclUuidTestCase.php
rename to tests/Generator/PeclUuidTestCase.php
diff --git a/tests/src/Generator/PeclUuidTimeGeneratorTest.php b/tests/Generator/PeclUuidTimeGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/PeclUuidTimeGeneratorTest.php
rename to tests/Generator/PeclUuidTimeGeneratorTest.php
diff --git a/tests/src/Generator/RandomBytesGeneratorTest.php b/tests/Generator/RandomBytesGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/RandomBytesGeneratorTest.php
rename to tests/Generator/RandomBytesGeneratorTest.php
diff --git a/tests/src/Generator/RandomGeneratorFactoryTest.php b/tests/Generator/RandomGeneratorFactoryTest.php
similarity index 100%
rename from tests/src/Generator/RandomGeneratorFactoryTest.php
rename to tests/Generator/RandomGeneratorFactoryTest.php
diff --git a/tests/src/Generator/RandomLibAdapterTest.php b/tests/Generator/RandomLibAdapterTest.php
similarity index 100%
rename from tests/src/Generator/RandomLibAdapterTest.php
rename to tests/Generator/RandomLibAdapterTest.php
diff --git a/tests/src/Generator/SodiumRandomGeneratorTest.php b/tests/Generator/SodiumRandomGeneratorTest.php
similarity index 100%
rename from tests/src/Generator/SodiumRandomGeneratorTest.php
rename to tests/Generator/SodiumRandomGeneratorTest.php
diff --git a/tests/src/Generator/TimeGeneratorFactoryTest.php b/tests/Generator/TimeGeneratorFactoryTest.php
similarity index 100%
rename from tests/src/Generator/TimeGeneratorFactoryTest.php
rename to tests/Generator/TimeGeneratorFactoryTest.php
diff --git a/tests/src/Provider/Node/FallbackNodeProviderTest.php b/tests/Provider/Node/FallbackNodeProviderTest.php
similarity index 100%
rename from tests/src/Provider/Node/FallbackNodeProviderTest.php
rename to tests/Provider/Node/FallbackNodeProviderTest.php
diff --git a/tests/src/Provider/Node/RandomNodeProviderTest.php b/tests/Provider/Node/RandomNodeProviderTest.php
similarity index 100%
rename from tests/src/Provider/Node/RandomNodeProviderTest.php
rename to tests/Provider/Node/RandomNodeProviderTest.php
diff --git a/tests/src/Provider/Node/SystemNodeProviderTest.php b/tests/Provider/Node/SystemNodeProviderTest.php
similarity index 100%
rename from tests/src/Provider/Node/SystemNodeProviderTest.php
rename to tests/Provider/Node/SystemNodeProviderTest.php
diff --git a/tests/src/Provider/Time/FixedTimeProviderTest.php b/tests/Provider/Time/FixedTimeProviderTest.php
similarity index 100%
rename from tests/src/Provider/Time/FixedTimeProviderTest.php
rename to tests/Provider/Time/FixedTimeProviderTest.php
diff --git a/tests/src/Provider/Time/SystemTimeProviderTest.php b/tests/Provider/Time/SystemTimeProviderTest.php
similarity index 100%
rename from tests/src/Provider/Time/SystemTimeProviderTest.php
rename to tests/Provider/Time/SystemTimeProviderTest.php
diff --git a/tests/src/TestCase.php b/tests/TestCase.php
similarity index 100%
rename from tests/src/TestCase.php
rename to tests/TestCase.php
diff --git a/tests/src/UuidFactoryTest.php b/tests/UuidFactoryTest.php
similarity index 100%
rename from tests/src/UuidFactoryTest.php
rename to tests/UuidFactoryTest.php
diff --git a/tests/src/UuidTest.php b/tests/UuidTest.php
similarity index 100%
rename from tests/src/UuidTest.php
rename to tests/UuidTest.php