diff --git a/composer.json b/composer.json
index d384b75..c3a7a48 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SVG\\": "tests/"
+            "SVG\\Tests\\": "tests/"
         }
     }
 }
diff --git a/tests/Nodes/Embedded/SVGImageTest.php b/tests/Nodes/Embedded/SVGImageTest.php
index 082091f..9974577 100644
--- a/tests/Nodes/Embedded/SVGImageTest.php
+++ b/tests/Nodes/Embedded/SVGImageTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Embedded;
+namespace SVG\Tests\Nodes\Embedded;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Embedded\SVGImage;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGImageTest extends \PHPUnit\Framework\TestCase
+class SVGImageTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/SVGNodeContainerTest.php b/tests/Nodes/SVGNodeContainerTest.php
index 419a663..8c6338f 100644
--- a/tests/Nodes/SVGNodeContainerTest.php
+++ b/tests/Nodes/SVGNodeContainerTest.php
@@ -1,7 +1,10 @@
 <?php
 
-namespace SVG\Nodes;
+namespace SVG\Tests\Nodes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\SVGNode;
+use SVG\Nodes\SVGNodeContainer;
 use SVG\Rasterization\SVGRasterizer;
 
 class SVGNodeContainerSubclass extends SVGNodeContainer
@@ -16,7 +19,7 @@ class SVGNodeContainerSubclass extends SVGNodeContainer
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGNodeContainerTest extends \PHPUnit\Framework\TestCase
+class SVGNodeContainerTest extends TestCase
 {
     /**
      * @covers ::addChild
diff --git a/tests/Nodes/SVGNodeTest.php b/tests/Nodes/SVGNodeTest.php
index ae39e93..b34e30b 100644
--- a/tests/Nodes/SVGNodeTest.php
+++ b/tests/Nodes/SVGNodeTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace SVG\Nodes;
+namespace SVG\Tests\Nodes;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\SVGNode;
 
 class SVGNodeSubclass extends SVGNode
 {
@@ -21,7 +24,7 @@ public function rasterize(\SVG\Rasterization\SVGRasterizer $rasterizer): void
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGNodeTest extends \PHPUnit\Framework\TestCase
+class SVGNodeTest extends TestCase
 {
     /**
      * @covers ::getName
diff --git a/tests/Nodes/Shapes/SVGCircleTest.php b/tests/Nodes/Shapes/SVGCircleTest.php
index b5608cc..a53b630 100644
--- a/tests/Nodes/Shapes/SVGCircleTest.php
+++ b/tests/Nodes/Shapes/SVGCircleTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGCircle;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,9 +12,9 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGCircleTest extends \PHPUnit\Framework\TestCase
+class SVGCircleTest extends TestCase
 {
-  /**
+    /**
      * @covers ::__construct
      */
     public function test__construct(): void
diff --git a/tests/Nodes/Shapes/SVGEllipseTest.php b/tests/Nodes/Shapes/SVGEllipseTest.php
index c5b4bfe..0c18c33 100644
--- a/tests/Nodes/Shapes/SVGEllipseTest.php
+++ b/tests/Nodes/Shapes/SVGEllipseTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGEllipse;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGEllipseTest extends \PHPUnit\Framework\TestCase
+class SVGEllipseTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Shapes/SVGLineTest.php b/tests/Nodes/Shapes/SVGLineTest.php
index bf36f5a..15dc7ec 100644
--- a/tests/Nodes/Shapes/SVGLineTest.php
+++ b/tests/Nodes/Shapes/SVGLineTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGLine;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGLineTest extends \PHPUnit\Framework\TestCase
+class SVGLineTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Shapes/SVGPathTest.php b/tests/Nodes/Shapes/SVGPathTest.php
index 717df0a..51dc689 100644
--- a/tests/Nodes/Shapes/SVGPathTest.php
+++ b/tests/Nodes/Shapes/SVGPathTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGPath;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGPathTest extends \PHPUnit\Framework\TestCase
+class SVGPathTest extends TestCase
 {
     private static $sampleDescription = 'M100,100 h20 Z M200,200 h20';
     private static $sampleCommands = [
diff --git a/tests/Nodes/Shapes/SVGPolygonTest.php b/tests/Nodes/Shapes/SVGPolygonTest.php
index 772d07e..cc6d803 100644
--- a/tests/Nodes/Shapes/SVGPolygonTest.php
+++ b/tests/Nodes/Shapes/SVGPolygonTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGPolygon;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGPolygonTest extends \PHPUnit\Framework\TestCase
+class SVGPolygonTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Shapes/SVGPolygonalShapeTest.php b/tests/Nodes/Shapes/SVGPolygonalShapeTest.php
index 5a4eb40..9975783 100644
--- a/tests/Nodes/Shapes/SVGPolygonalShapeTest.php
+++ b/tests/Nodes/Shapes/SVGPolygonalShapeTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGPolygonalShape;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -25,7 +28,7 @@ public function rasterize(\SVG\Rasterization\SVGRasterizer $rasterizer): void
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGPolygonalShapeTest extends \PHPUnit\Framework\TestCase
+class SVGPolygonalShapeTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Shapes/SVGPolylineTest.php b/tests/Nodes/Shapes/SVGPolylineTest.php
index a2bc86d..c5a5616 100644
--- a/tests/Nodes/Shapes/SVGPolylineTest.php
+++ b/tests/Nodes/Shapes/SVGPolylineTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGPolyline;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGPolylineTest extends \PHPUnit\Framework\TestCase
+class SVGPolylineTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Shapes/SVGRectTest.php b/tests/Nodes/Shapes/SVGRectTest.php
index 87d7766..48ea508 100644
--- a/tests/Nodes/Shapes/SVGRectTest.php
+++ b/tests/Nodes/Shapes/SVGRectTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Shapes;
+namespace SVG\Tests\Nodes\Shapes;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Shapes\SVGRect;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGRectTest extends \PHPUnit\Framework\TestCase
+class SVGRectTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Structures/SVGDefsTest.php b/tests/Nodes/Structures/SVGDefsTest.php
index ff1d4a7..caba4d5 100644
--- a/tests/Nodes/Structures/SVGDefsTest.php
+++ b/tests/Nodes/Structures/SVGDefsTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Structures;
+namespace SVG\Tests\Nodes\Structures;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Structures\SVGDefs;
 use SVG\Nodes\SVGNode;
 use SVG\Rasterization\SVGRasterizer;
 
@@ -11,7 +13,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGDefsTest extends \PHPUnit\Framework\TestCase
+class SVGDefsTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Structures/SVGDocumentFragmentTest.php b/tests/Nodes/Structures/SVGDocumentFragmentTest.php
index 6d976b1..2eb1c94 100644
--- a/tests/Nodes/Structures/SVGDocumentFragmentTest.php
+++ b/tests/Nodes/Structures/SVGDocumentFragmentTest.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace SVG\Nodes\Structures;
+namespace SVG\Tests\Nodes\Structures;
 
 use AssertGD\GDSimilarityConstraint;
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Structures\SVGDocumentFragment;
 use SVG\Nodes\SVGNode;
 use SVG\Nodes\SVGNodeContainer;
 
@@ -12,7 +14,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGDocumentFragmentTest extends \PHPUnit\Framework\TestCase
+class SVGDocumentFragmentTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Structures/SVGScriptTest.php b/tests/Nodes/Structures/SVGScriptTest.php
index 0d206b9..c64de7f 100644
--- a/tests/Nodes/Structures/SVGScriptTest.php
+++ b/tests/Nodes/Structures/SVGScriptTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Structures;
+namespace SVG\Tests\Nodes\Structures;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Structures\SVGScript;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -9,7 +11,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGScriptTest extends \PHPUnit\Framework\TestCase
+class SVGScriptTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Structures/SVGStyleTest.php b/tests/Nodes/Structures/SVGStyleTest.php
index f5b0a9f..29d3af6 100644
--- a/tests/Nodes/Structures/SVGStyleTest.php
+++ b/tests/Nodes/Structures/SVGStyleTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Structures;
+namespace SVG\Tests\Nodes\Structures;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Structures\SVGStyle;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -9,7 +11,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGStyleTest extends \PHPUnit\Framework\TestCase
+class SVGStyleTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Nodes/Texts/SVGTextTest.php b/tests/Nodes/Texts/SVGTextTest.php
index 12159e6..0edccc0 100644
--- a/tests/Nodes/Texts/SVGTextTest.php
+++ b/tests/Nodes/Texts/SVGTextTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Nodes\Texts;
+namespace SVG\Tests\Nodes\Texts;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Nodes\Texts\SVGText;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -10,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGTextTest extends \PHPUnit\Framework\TestCase
+class SVGTextTest extends TestCase
 {
     /**
      * @covers ::rasterize
@@ -28,7 +30,7 @@ public function testRasterizeShouldHaveDefaultFontSize(): void
         // should call image renderer with correct options
         $rast->expects($this->once())->method('render')->with(
             $this->identicalTo('text'),
-            $this->callback(fn($options) => isset($options['fontSize']) && $options['fontSize'] === 16),
+            $this->callback(fn ($options) => isset($options['fontSize']) && $options['fontSize'] === 16),
             $this->identicalTo($obj)
         );
         $obj->rasterize($rast);
diff --git a/tests/Rasterization/Path/ArcApproximatorTest.php b/tests/Rasterization/Path/ArcApproximatorTest.php
index 523e0c6..0f97904 100644
--- a/tests/Rasterization/Path/ArcApproximatorTest.php
+++ b/tests/Rasterization/Path/ArcApproximatorTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Rasterization\Path;
+namespace SVG\Tests\Rasterization\Path;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Path\ArcApproximator;
 
 /**
  * @covers \SVG\Rasterization\Path\ArcApproximator
  *
  * @SuppressWarnings(PHPMD)
  */
-class ArcApproximatorTest extends \PHPUnit\Framework\TestCase
+class ArcApproximatorTest extends TestCase
 {
     public function testApproximate(): void
     {
diff --git a/tests/Rasterization/Path/BezierApproximatorTest.php b/tests/Rasterization/Path/BezierApproximatorTest.php
index eb5b972..8f21f52 100644
--- a/tests/Rasterization/Path/BezierApproximatorTest.php
+++ b/tests/Rasterization/Path/BezierApproximatorTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Rasterization\Path;
+namespace SVG\Tests\Rasterization\Path;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Path\BezierApproximator;
 
 /**
  * @covers \SVG\Rasterization\Path\BezierApproximator
  *
  * @SuppressWarnings(PHPMD)
  */
-class BezierApproximatorTest extends \PHPUnit\Framework\TestCase
+class BezierApproximatorTest extends TestCase
 {
     public function testQuadratic(): void
     {
diff --git a/tests/Rasterization/Path/PathApproximatorTest.php b/tests/Rasterization/Path/PathApproximatorTest.php
index 3159957..ea9f2bc 100644
--- a/tests/Rasterization/Path/PathApproximatorTest.php
+++ b/tests/Rasterization/Path/PathApproximatorTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Rasterization\Path;
+namespace SVG\Tests\Rasterization\Path;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Path\PathApproximator;
 use SVG\Rasterization\Transform\Transform;
 
 /**
@@ -9,7 +11,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class PathApproximatorTest extends \PHPUnit\Framework\TestCase
+class PathApproximatorTest extends TestCase
 {
     // general tests
 
diff --git a/tests/Rasterization/Path/PathParserTest.php b/tests/Rasterization/Path/PathParserTest.php
index 6e3a865..28300c5 100644
--- a/tests/Rasterization/Path/PathParserTest.php
+++ b/tests/Rasterization/Path/PathParserTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Rasterization\Path;
+namespace SVG\Tests\Rasterization\Path;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Path\PathParser;
 
 /**
  * @covers \SVG\Rasterization\Path\PathParser
  *
  * @SuppressWarnings(PHPMD)
  */
-class PathParserTest extends \PHPUnit\Framework\TestCase
+class PathParserTest extends TestCase
 {
     public function testShouldSplitCorrectly(): void
     {
diff --git a/tests/Rasterization/Path/PolygonBuilderTest.php b/tests/Rasterization/Path/PolygonBuilderTest.php
index 5f82d0d..6e1da29 100644
--- a/tests/Rasterization/Path/PolygonBuilderTest.php
+++ b/tests/Rasterization/Path/PolygonBuilderTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace SVG\Rasterization\Path;
+namespace SVG\Tests\Rasterization\Path;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Path\PolygonBuilder;
 
 /**
  * @coversDefaultClass \SVG\Rasterization\Path\PolygonBuilder
@@ -8,7 +11,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class PolygonBuilderTest extends \PHPUnit\Framework\TestCase
+class PolygonBuilderTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/Rasterization/Renderers/ImageRendererTest.php b/tests/Rasterization/Renderers/ImageRendererTest.php
index 695ea25..70fd942 100644
--- a/tests/Rasterization/Renderers/ImageRendererTest.php
+++ b/tests/Rasterization/Renderers/ImageRendererTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace SVG\Rasterization\Renderers;
+namespace SVG\Tests\Rasterization\Renderers;
 
 use AssertGD\GDSimilarityConstraint;
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\SVGNode;
+use SVG\Rasterization\Renderers\ImageRenderer;
 use SVG\Rasterization\SVGRasterizer;
 
 class SVGNodeClass extends SVGNode
@@ -24,7 +26,7 @@ public function rasterize(\SVG\Rasterization\SVGRasterizer $rasterizer): void
  *
  * @SuppressWarnings(PHPMD)
  */
-class ImageRendererTest extends \PHPUnit\Framework\TestCase
+class ImageRendererTest extends TestCase
 {
     public function testRender(): void
     {
diff --git a/tests/Rasterization/Renderers/MultiPassRendererTest.php b/tests/Rasterization/Renderers/MultiPassRendererTest.php
index ac49e61..98f4d16 100644
--- a/tests/Rasterization/Renderers/MultiPassRendererTest.php
+++ b/tests/Rasterization/Renderers/MultiPassRendererTest.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace SVG\Rasterization\Renderers;
+namespace SVG\Tests\Rasterization\Renderers;
 
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\SVGNode;
+use SVG\Rasterization\Renderers\MultiPassRenderer;
 use SVG\Rasterization\Transform\Transform;
 
 /**
@@ -11,7 +13,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class MultiPassRendererTest extends \PHPUnit\Framework\TestCase
+class MultiPassRendererTest extends TestCase
 {
     private static $sampleOptions = [
         'option1' => 'option1-value',
diff --git a/tests/Rasterization/Renderers/PolygonRendererTest.php b/tests/Rasterization/Renderers/PolygonRendererTest.php
index 4464ec5..51644c0 100644
--- a/tests/Rasterization/Renderers/PolygonRendererTest.php
+++ b/tests/Rasterization/Renderers/PolygonRendererTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace SVG\Rasterization\Renderers;
+namespace SVG\Tests\Rasterization\Renderers;
 
 use AssertGD\GDSimilarityConstraint;
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\SVGNode;
+use SVG\Rasterization\Renderers\PolygonRenderer;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -12,7 +14,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class PolygonRendererTest extends \PHPUnit\Framework\TestCase
+class PolygonRendererTest extends TestCase
 {
     public function testShouldNotFailForTooFewPoints(): void
     {
diff --git a/tests/Rasterization/Renderers/RectRendererTest.php b/tests/Rasterization/Renderers/RectRendererTest.php
index 288f277..bc3af9d 100644
--- a/tests/Rasterization/Renderers/RectRendererTest.php
+++ b/tests/Rasterization/Renderers/RectRendererTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace SVG\Rasterization\Renderers;
+namespace SVG\Tests\Rasterization\Renderers;
 
 use AssertGD\GDSimilarityConstraint;
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\SVGNode;
+use SVG\Rasterization\Renderers\RectRenderer;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -12,7 +14,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class RectRendererTest extends \PHPUnit\Framework\TestCase
+class RectRendererTest extends TestCase
 {
     public function testShouldRenderStroke(): void
     {
diff --git a/tests/Rasterization/Renderers/TextRendererTest.php b/tests/Rasterization/Renderers/TextRendererTest.php
index ff8a202..d79876f 100644
--- a/tests/Rasterization/Renderers/TextRendererTest.php
+++ b/tests/Rasterization/Renderers/TextRendererTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace SVG\Rasterization\Renderers;
+namespace SVG\Tests\Rasterization\Renderers;
 
 use AssertGD\GDSimilarityConstraint;
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\SVGNode;
+use SVG\Rasterization\Renderers\TextRenderer;
 use SVG\Rasterization\SVGRasterizer;
 
 /**
@@ -12,7 +14,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class TextRendererTest extends \PHPUnit\Framework\TestCase
+class TextRendererTest extends TestCase
 {
     public function testShouldNotFailWithoutRegisteredFont(): void
     {
diff --git a/tests/Rasterization/SVGRasterizerTest.php b/tests/Rasterization/SVGRasterizerTest.php
index 52ac485..d40d4a5 100644
--- a/tests/Rasterization/SVGRasterizerTest.php
+++ b/tests/Rasterization/SVGRasterizerTest.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace SVG\Rasterization;
+namespace SVG\Tests\Rasterization;
 
 use AssertGD\GDSimilarityConstraint;
+use PHPUnit\Framework\TestCase;
 use Exception;
 use SVG\Nodes\SVGNode;
+use SVG\Rasterization\SVGRasterizer;
 
 /**
  * @requires extension gd
@@ -13,7 +15,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGRasterizerTest extends \PHPUnit\Framework\TestCase
+class SVGRasterizerTest extends TestCase
 {
     /**
      * @covers ::getDocumentWidth
diff --git a/tests/Rasterization/Transform/TransformParserTest.php b/tests/Rasterization/Transform/TransformParserTest.php
index 100a059..77d0000 100644
--- a/tests/Rasterization/Transform/TransformParserTest.php
+++ b/tests/Rasterization/Transform/TransformParserTest.php
@@ -1,13 +1,17 @@
 <?php
 
-namespace SVG\Rasterization\Transform;
+namespace SVG\Tests\Rasterization\Transform;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Transform\Transform;
+use SVG\Rasterization\Transform\TransformParser;
 
 /**
  * @coversDefaultClass \SVG\Rasterization\Transform\TransformParser
  *
  * @SuppressWarnings(PHPMD)
  */
-class TransformParserTest extends \PHPUnit\Framework\TestCase
+class TransformParserTest extends TestCase
 {
     private function assertMap(Transform $t, array $expected, array $source): void
     {
diff --git a/tests/Rasterization/Transform/TransformTest.php b/tests/Rasterization/Transform/TransformTest.php
index 6dd43aa..90ad5f1 100644
--- a/tests/Rasterization/Transform/TransformTest.php
+++ b/tests/Rasterization/Transform/TransformTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Rasterization\Transform;
+namespace SVG\Tests\Rasterization\Transform;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Rasterization\Transform\Transform;
 
 /**
  * @coversDefaultClass \SVG\Rasterization\Transform\Transform
  *
  * @SuppressWarnings(PHPMD)
  */
-class TransformTest extends \PHPUnit\Framework\TestCase
+class TransformTest extends TestCase
 {
     private function assertMap(Transform $t, array $expected, array $source): void
     {
diff --git a/tests/Reading/AttributeRegistryTest.php b/tests/Reading/AttributeRegistryTest.php
index f35c32a..c70f5ae 100644
--- a/tests/Reading/AttributeRegistryTest.php
+++ b/tests/Reading/AttributeRegistryTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace SVG\Reading;
+namespace SVG\Tests\Reading;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Reading\AttributeRegistry;
 
 /**
  * @coversDefaultClass \SVG\Reading\AttributeRegistry
@@ -8,7 +11,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class AttributeRegistryTest extends \PHPUnit\Framework\TestCase
+class AttributeRegistryTest extends TestCase
 {
     /**
      * @covers ::isStyle
diff --git a/tests/Reading/LengthAttributeConverterTest.php b/tests/Reading/LengthAttributeConverterTest.php
index 07bf314..784f742 100644
--- a/tests/Reading/LengthAttributeConverterTest.php
+++ b/tests/Reading/LengthAttributeConverterTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Reading;
+namespace SVG\Tests\Reading;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Reading\LengthAttributeConverter;
 
 /**
  * @covers \SVG\Reading\LengthAttributeConverter
  *
  * @SuppressWarnings(PHPMD)
  */
-class LengthAttributeConverterTest extends \PHPUnit\Framework\TestCase
+class LengthAttributeConverterTest extends TestCase
 {
     public function testShouldQualifyUnitlessNumbers(): void
     {
diff --git a/tests/Reading/NodeRegistryTest.php b/tests/Reading/NodeRegistryTest.php
index d292292..df61338 100644
--- a/tests/Reading/NodeRegistryTest.php
+++ b/tests/Reading/NodeRegistryTest.php
@@ -1,16 +1,18 @@
 <?php
 
-namespace SVG\Reading;
+namespace SVG\Tests\Reading;
 
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\Shapes\SVGRect;
 use SVG\Nodes\SVGGenericNodeType;
+use SVG\Reading\NodeRegistry;
 
 /**
  * @covers \SVG\Reading\NodeRegistry
  *
  * @SuppressWarnings(PHPMD)
  */
-class NodeRegistryTest extends \PHPUnit\Framework\TestCase
+class NodeRegistryTest extends TestCase
 {
     public function testShouldConstructKnownTypes(): void
     {
diff --git a/tests/Reading/SVGReaderTest.php b/tests/Reading/SVGReaderTest.php
index 170bb5e..3a029d1 100644
--- a/tests/Reading/SVGReaderTest.php
+++ b/tests/Reading/SVGReaderTest.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace SVG\Reading;
+namespace SVG\Tests\Reading;
 
+use PHPUnit\Framework\TestCase;
+use SVG\Reading\SVGReader;
 use SVG\SVG;
 
 /**
@@ -9,7 +11,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGReaderTest extends \PHPUnit\Framework\TestCase
+class SVGReaderTest extends TestCase
 {
     private $xml;
     private $xmlNoViewBox;
diff --git a/tests/SVGTest.php b/tests/SVGTest.php
index e3379c5..913eb2c 100644
--- a/tests/SVGTest.php
+++ b/tests/SVGTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace SVG;
+namespace SVG\Tests;
 
+use PHPUnit\Framework\TestCase;
 use SVG\Nodes\Structures\SVGDocumentFragment;
 use SVG\SVG;
 
@@ -11,7 +12,7 @@
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGTest extends \PHPUnit\Framework\TestCase
+class SVGTest extends TestCase
 {
     private $xml;
     private $xmlNoDeclaration;
diff --git a/tests/Shims/StrTest.php b/tests/Shims/StrTest.php
index 92398cc..a48bd20 100644
--- a/tests/Shims/StrTest.php
+++ b/tests/Shims/StrTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace SVG\Shims;
+namespace SVG\Tests\Shims;
 
 use PHPUnit\Framework\TestCase;
+use SVG\Shims\Str;
 
 class StrTest extends TestCase
 {
diff --git a/tests/Utilities/Colors/ColorLookupTest.php b/tests/Utilities/Colors/ColorLookupTest.php
index 50dc0ab..a19fb7d 100644
--- a/tests/Utilities/Colors/ColorLookupTest.php
+++ b/tests/Utilities/Colors/ColorLookupTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Utilities\Colors;
+namespace SVG\Tests\Utilities\Colors;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Utilities\Colors\ColorLookup;
 
 /**
  * @covers \SVG\Utilities\Colors\ColorLookup
  *
  * @SuppressWarnings(PHPMD)
  */
-class ColorLookupTest extends \PHPUnit\Framework\TestCase
+class ColorLookupTest extends TestCase
 {
     public function testGet(): void
     {
diff --git a/tests/Utilities/Colors/ColorTest.php b/tests/Utilities/Colors/ColorTest.php
index 6467691..8ffea13 100644
--- a/tests/Utilities/Colors/ColorTest.php
+++ b/tests/Utilities/Colors/ColorTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Utilities\Colors;
+namespace SVG\Tests\Utilities\Colors;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Utilities\Colors\Color;
 
 /**
  * @covers \SVG\Utilities\Colors\Color
  *
  * @SuppressWarnings(PHPMD)
  */
-class ColorTest extends \PHPUnit\Framework\TestCase
+class ColorTest extends TestCase
 {
     public function testParse(): void
     {
diff --git a/tests/Utilities/SVGStyleParserTest.php b/tests/Utilities/SVGStyleParserTest.php
index 385b8b3..fa61aa1 100644
--- a/tests/Utilities/SVGStyleParserTest.php
+++ b/tests/Utilities/SVGStyleParserTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Utilities;
+namespace SVG\Tests\Utilities;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Utilities\SVGStyleParser;
 
 /**
  * @covers \SVG\Utilities\SVGStyleParser
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGStyleParserTest extends \PHPUnit\Framework\TestCase
+class SVGStyleParserTest extends TestCase
 {
     public function testParseStylesWithEmptyString(): void
     {
diff --git a/tests/Utilities/Units/AngleTest.php b/tests/Utilities/Units/AngleTest.php
index 7ab7146..f56cd5c 100644
--- a/tests/Utilities/Units/AngleTest.php
+++ b/tests/Utilities/Units/AngleTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Utilities\Units;
+namespace SVG\Tests\Utilities\Units;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Utilities\Units\Angle;
 
 /**
  * @covers \SVG\Utilities\Units\Angle
  *
  * @SuppressWarnings(PHPMD)
  */
-class AngleTest extends \PHPUnit\Framework\TestCase
+class AngleTest extends TestCase
 {
     public function testConvert(): void
     {
diff --git a/tests/Utilities/Units/LengthTest.php b/tests/Utilities/Units/LengthTest.php
index 68448a0..6a49a92 100644
--- a/tests/Utilities/Units/LengthTest.php
+++ b/tests/Utilities/Units/LengthTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Utilities\Units;
+namespace SVG\Tests\Utilities\Units;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Utilities\Units\Length;
 
 /**
  * @covers \SVG\Utilities\Units\Length
  *
  * @SuppressWarnings(PHPMD)
  */
-class LengthTest extends \PHPUnit\Framework\TestCase
+class LengthTest extends TestCase
 {
     public function testConvert(): void
     {
diff --git a/tests/Writing/SVGWriterTest.php b/tests/Writing/SVGWriterTest.php
index 9f9624d..17156c6 100644
--- a/tests/Writing/SVGWriterTest.php
+++ b/tests/Writing/SVGWriterTest.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace SVG\Writing;
+namespace SVG\Tests\Writing;
+
+use PHPUnit\Framework\TestCase;
+use SVG\Writing\SVGWriter;
 
 /**
  * @covers \SVG\Writing\SVGWriter
  *
  * @SuppressWarnings(PHPMD)
  */
-class SVGWriterTest extends \PHPUnit\Framework\TestCase
+class SVGWriterTest extends TestCase
 {
     private $xmlDeclaration = '<?xml version="1.0" encoding="utf-8"?>';