diff --git a/tests/cases/Date/DateTest.php b/tests/cases/Util/Date/DateTest.php
similarity index 98%
rename from tests/cases/Date/DateTest.php
rename to tests/cases/Util/Date/DateTest.php
index 2a6423e..79d3afc 100644
--- a/tests/cases/Date/DateTest.php
+++ b/tests/cases/Util/Date/DateTest.php
@@ -4,7 +4,7 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace MensBeam\Lax\TestCase\Date;
+namespace MensBeam\Lax\TestCase\Util\Date;
 
 use MensBeam\Lax\Date;
 use Symfony\Component\Yaml\Yaml;
diff --git a/tests/cases/Date/test-asctime.yaml b/tests/cases/Util/Date/test-asctime.yaml
similarity index 100%
rename from tests/cases/Date/test-asctime.yaml
rename to tests/cases/Util/Date/test-asctime.yaml
diff --git a/tests/cases/Date/test-rfc3339.yaml b/tests/cases/Util/Date/test-rfc3339.yaml
similarity index 100%
rename from tests/cases/Date/test-rfc3339.yaml
rename to tests/cases/Util/Date/test-rfc3339.yaml
diff --git a/tests/cases/Date/test-rfc822.yaml b/tests/cases/Util/Date/test-rfc822.yaml
similarity index 100%
rename from tests/cases/Date/test-rfc822.yaml
rename to tests/cases/Util/Date/test-rfc822.yaml
diff --git a/tests/cases/Date/test-rfc850.yaml b/tests/cases/Util/Date/test-rfc850.yaml
similarity index 100%
rename from tests/cases/Date/test-rfc850.yaml
rename to tests/cases/Util/Date/test-rfc850.yaml
diff --git a/tests/cases/Util/Url/AbstractUriTestCase.php b/tests/cases/Util/Url/Psr7TestCase.php
similarity index 99%
rename from tests/cases/Util/Url/AbstractUriTestCase.php
rename to tests/cases/Util/Url/Psr7TestCase.php
index 2a8818b..77df695 100644
--- a/tests/cases/Util/Url/AbstractUriTestCase.php
+++ b/tests/cases/Util/Url/Psr7TestCase.php
@@ -6,7 +6,7 @@ use Psr\Http\Message\UriInterface;
 use PHPUnit\Framework\TestCase;
 use InvalidArgumentException;
 
-abstract class AbstractUriTestCase extends TestCase {
+abstract class Psr7TestCase extends TestCase {
     /**
      * @var UriInterface
      */
diff --git a/tests/cases/Util/UrlTest.php b/tests/cases/Util/Url/UrlTest.php
similarity index 66%
rename from tests/cases/Util/UrlTest.php
rename to tests/cases/Util/Url/UrlTest.php
index 54e5305..3e87e06 100644
--- a/tests/cases/Util/UrlTest.php
+++ b/tests/cases/Util/Url/UrlTest.php
@@ -4,13 +4,12 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace MensBeam\Lax\TestCase\Util;
+namespace MensBeam\Lax\TestCase\Util\Url;
 
 use MensBeam\Lax\Url;
-use MensBeam\Lax\TestCase\Util\Url\AbstractUriTestCase;
 
 /** @covers MensBeam\Lax\Url<extended> */
-class UrlTest extends AbstractUriTestCase {
+class UrlTest extends Psr7TestCase {
     protected function createUri($uri = '') {
         return new Url($uri);
     }
diff --git a/tests/phpunit.dist.xml b/tests/phpunit.dist.xml
index fac6e43..c79b603 100644
--- a/tests/phpunit.dist.xml
+++ b/tests/phpunit.dist.xml
@@ -22,9 +22,6 @@
     <testsuite name="Util">
         <directory>cases/Util</directory>
     </testsuite>
-    <testsuite name="Date">
-        <directory>cases/Date</directory>
-    </testsuite>
     <testsuite name="JSON">
         <directory>cases/JSON</directory>
     </testsuite>