diff --git a/composer.json b/composer.json
index 06fb482..c8858b6 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
 		"classmap": ["lib/"]
 	},
 	"autoload-dev": {
-		"classmap": ["tests/TestCase.php"]
+		"psr-4": {"Minify\\Test\\": "tests/"}
 	},
 	"require": {
 		"ext-pcre": "*",
diff --git a/tests/HTTPConditionalGetTest.php b/tests/HTTPConditionalGetTest.php
index 237fcd0..6b5aa94 100644
--- a/tests/HTTPConditionalGetTest.php
+++ b/tests/HTTPConditionalGetTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class HTTPConditionalGetTest extends TestCase
 {
     public function TestData()
diff --git a/tests/HTTPEncoderTest.php b/tests/HTTPEncoderTest.php
index 6f1ace7..52da364 100644
--- a/tests/HTTPEncoderTest.php
+++ b/tests/HTTPEncoderTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class HTTPEncoderTest extends TestCase
 {
     /**
diff --git a/tests/JSMinTest.php b/tests/JSMinTest.php
index aa686da..ec5e7f6 100644
--- a/tests/JSMinTest.php
+++ b/tests/JSMinTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use JSMin\JSMin;
+use Minify\Test\TestCase;
 
 class JsMinTest extends TestCase
 {
diff --git a/tests/JsClosureCompilerTest.php b/tests/JsClosureCompilerTest.php
index 380958f..6d3a52c 100644
--- a/tests/JsClosureCompilerTest.php
+++ b/tests/JsClosureCompilerTest.php
@@ -1,6 +1,8 @@
 <?php
 
-class JsClosureCompilerTest extends PHPUnit_Framework_TestCase
+use Minify\Test\TestCase;
+
+class JsClosureCompilerTest extends TestCase
 {
     public function test1()
     {
diff --git a/tests/LessSourceTest.php b/tests/LessSourceTest.php
index a2b5158..753e0c6 100644
--- a/tests/LessSourceTest.php
+++ b/tests/LessSourceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class LessSourceTest extends TestCase
 {
     public function setUp()
diff --git a/tests/MinifyBuildTest.php b/tests/MinifyBuildTest.php
index 90fb5d2..8934268 100644
--- a/tests/MinifyBuildTest.php
+++ b/tests/MinifyBuildTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyBuildTest extends TestCase
 {
     public function test()
diff --git a/tests/MinifyCSSUriRewriterTest.php b/tests/MinifyCSSUriRewriterTest.php
index 1f897ad..e48947a 100644
--- a/tests/MinifyCSSUriRewriterTest.php
+++ b/tests/MinifyCSSUriRewriterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCSSUriRewriterTest extends TestCase
 {
     public function setUp()
diff --git a/tests/MinifyCacheAPCTest.php b/tests/MinifyCacheAPCTest.php
index a9a67ee..42303b7 100644
--- a/tests/MinifyCacheAPCTest.php
+++ b/tests/MinifyCacheAPCTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCacheAPCTest extends TestCase
 {
     public function setUp()
diff --git a/tests/MinifyCacheFileTest.php b/tests/MinifyCacheFileTest.php
index f36b12d..1817a2b 100644
--- a/tests/MinifyCacheFileTest.php
+++ b/tests/MinifyCacheFileTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCacheFileTest extends TestCase
 {
     public function test1()
diff --git a/tests/MinifyCacheMemcacheTest.php b/tests/MinifyCacheMemcacheTest.php
index a9543c8..322720f 100644
--- a/tests/MinifyCacheMemcacheTest.php
+++ b/tests/MinifyCacheMemcacheTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCacheMemcacheTest extends TestCase
 {
     /** @var Memcache */
diff --git a/tests/MinifyCacheWinCacheTest.php b/tests/MinifyCacheWinCacheTest.php
index e6642bd..cb3f863 100644
--- a/tests/MinifyCacheWinCacheTest.php
+++ b/tests/MinifyCacheWinCacheTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCacheWinCacheTest extends TestCase
 {
     public function setUp()
diff --git a/tests/MinifyCacheZendPlatformTest.php b/tests/MinifyCacheZendPlatformTest.php
index 2d2ea61..9aa7fe8 100644
--- a/tests/MinifyCacheZendPlatformTest.php
+++ b/tests/MinifyCacheZendPlatformTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCacheZendPlatformTest extends TestCase
 {
     public function setUp()
diff --git a/tests/MinifyClosureCompilerTest.php b/tests/MinifyClosureCompilerTest.php
index 84dc1e3..aa6b671 100644
--- a/tests/MinifyClosureCompilerTest.php
+++ b/tests/MinifyClosureCompilerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyClosureCompilerTest extends TestCase
 {
     public static function setupBeforeClass()
diff --git a/tests/MinifyCommentPreserverTest.php b/tests/MinifyCommentPreserverTest.php
index ea48853..827cd05 100644
--- a/tests/MinifyCommentPreserverTest.php
+++ b/tests/MinifyCommentPreserverTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyCommentPreserverTest extends TestCase
 {
     public function test()
diff --git a/tests/MinifyHTMLHelperTest.php b/tests/MinifyHTMLHelperTest.php
index 14bd7d4..dda9983 100644
--- a/tests/MinifyHTMLHelperTest.php
+++ b/tests/MinifyHTMLHelperTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyHTMLHelperTest extends TestCase
 {
     private $realDocRoot;
diff --git a/tests/MinifyHTMLTest.php b/tests/MinifyHTMLTest.php
index defb144..6258a7b 100644
--- a/tests/MinifyHTMLTest.php
+++ b/tests/MinifyHTMLTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyHTMLTest extends TestCase
 {
     public function test1()
diff --git a/tests/MinifyImportProcessorTest.php b/tests/MinifyImportProcessorTest.php
index a7e57ff..eab211c 100644
--- a/tests/MinifyImportProcessorTest.php
+++ b/tests/MinifyImportProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyImportProcessorTest extends TestCase
 {
     public function test()
diff --git a/tests/MinifyLinesTest.php b/tests/MinifyLinesTest.php
index 87f27c5..ad6792f 100644
--- a/tests/MinifyLinesTest.php
+++ b/tests/MinifyLinesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyLinesTest extends TestCase
 {
     public function test_lines()
diff --git a/tests/MinifyNailgunClosureCompilerTest.php b/tests/MinifyNailgunClosureCompilerTest.php
index 572ed5f..f6de982 100644
--- a/tests/MinifyNailgunClosureCompilerTest.php
+++ b/tests/MinifyNailgunClosureCompilerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyNailgunClosureCompilerTest extends TestCase
 {
     public static function setupBeforeClass()
diff --git a/tests/MinifyTest.php b/tests/MinifyTest.php
index 89a37e0..213fe55 100644
--- a/tests/MinifyTest.php
+++ b/tests/MinifyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyTest extends TestCase
 {
     public function test_Minify()
diff --git a/tests/MinifyYuiCSSTest.php b/tests/MinifyYuiCSSTest.php
index bbbc796..0cba638 100644
--- a/tests/MinifyYuiCSSTest.php
+++ b/tests/MinifyYuiCSSTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class MinifyYuiCSSTest extends TestCase
 {
     public static function setupBeforeClass()
diff --git a/tests/ScssSourceTest.php b/tests/ScssSourceTest.php
index a8123dd..b9099a5 100644
--- a/tests/ScssSourceTest.php
+++ b/tests/ScssSourceTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Minify\Test\TestCase;
+
 class ScssSourceTest extends TestCase
 {
     public function setUp()
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 2987edf..fda57d3 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Minify\Test;
+
+use Minify_CacheInterface;
+
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     /** @var string */