diff --git a/tests/HTTPConditionalGetTest.php b/tests/HTTPConditionalGetTest.php
index 6b5aa94..e6365f4 100644
--- a/tests/HTTPConditionalGetTest.php
+++ b/tests/HTTPConditionalGetTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use HTTP_ConditionalGet;
 
 class HTTPConditionalGetTest extends TestCase
 {
diff --git a/tests/HTTPEncoderTest.php b/tests/HTTPEncoderTest.php
index 52da364..66e993c 100644
--- a/tests/HTTPEncoderTest.php
+++ b/tests/HTTPEncoderTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use HTTP_Encoder;
 
 class HTTPEncoderTest extends TestCase
 {
diff --git a/tests/JSMinTest.php b/tests/JSMinTest.php
index ec5e7f6..271a483 100644
--- a/tests/JSMinTest.php
+++ b/tests/JSMinTest.php
@@ -1,9 +1,11 @@
 <?php
 
-use JSMin\JSMin;
-use Minify\Test\TestCase;
+namespace Minify\Test;
 
-class JsMinTest extends TestCase
+use Exception;
+use JSMin\JSMin;
+
+class JSMinTest extends TestCase
 {
     public function test1()
     {
diff --git a/tests/JsClosureCompilerTest.php b/tests/JsClosureCompilerTest.php
index 6d3a52c..1d3ffab 100644
--- a/tests/JsClosureCompilerTest.php
+++ b/tests/JsClosureCompilerTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_JS_ClosureCompiler;
+use Minify_JS_ClosureCompiler_Exception;
 
 class JsClosureCompilerTest extends TestCase
 {
@@ -29,7 +32,8 @@ class JsClosureCompilerTest extends TestCase
             $this->compile($src);
         } catch (Minify_JS_ClosureCompiler_Exception $e) {
         }
-        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, 'Throws Minify_JS_ClosureCompiler_Exception');
+        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e,
+            'Throws Minify_JS_ClosureCompiler_Exception');
     }
 
     // Test maximum byte size check (default)
@@ -42,7 +46,8 @@ class JsClosureCompilerTest extends TestCase
             $this->compile($src);
         } catch (Minify_JS_ClosureCompiler_Exception $e) {
         }
-        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, 'Throws Minify_JS_ClosureCompiler_Exception');
+        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e,
+            'Throws Minify_JS_ClosureCompiler_Exception');
 
         $expected = 'POST content larger than ' . Minify_JS_ClosureCompiler::DEFAULT_MAX_BYTES . ' bytes';
         $this->assertEquals($expected, $e->getMessage(), 'Message must tell how big maximum byte size is');
@@ -71,7 +76,8 @@ class JsClosureCompilerTest extends TestCase
             ));
         } catch (Minify_JS_ClosureCompiler_Exception $e) {
         }
-        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, 'Throws Minify_JS_ClosureCompiler_Exception');
+        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e,
+            'Throws Minify_JS_ClosureCompiler_Exception');
 
         $expected = 'POST content larger than ' . $allowedBytes . ' bytes';
         $this->assertEquals($expected, $e->getMessage(), 'Message must tell how big maximum byte size is');
@@ -90,7 +96,8 @@ class JsClosureCompilerTest extends TestCase
             ));
         } catch (Minify_JS_ClosureCompiler_Exception $e) {
         }
-        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, 'Throws Minify_JS_ClosureCompiler_Exception');
+        $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e,
+            'Throws Minify_JS_ClosureCompiler_Exception');
     }
 
     public function test7()
diff --git a/tests/LessSourceTest.php b/tests/LessSourceTest.php
index 753e0c6..037d055 100644
--- a/tests/LessSourceTest.php
+++ b/tests/LessSourceTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_HTML_Helper;
 
 class LessSourceTest extends TestCase
 {
diff --git a/tests/MinifyBuildTest.php b/tests/MinifyBuildTest.php
index 8934268..f0ab994 100644
--- a/tests/MinifyBuildTest.php
+++ b/tests/MinifyBuildTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_Build;
+use Minify_Source;
 
 class MinifyBuildTest extends TestCase
 {
diff --git a/tests/MinifyCSSUriRewriterTest.php b/tests/MinifyCSSUriRewriterTest.php
index e48947a..83871bf 100644
--- a/tests/MinifyCSSUriRewriterTest.php
+++ b/tests/MinifyCSSUriRewriterTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_CSS_UriRewriter;
 
 class MinifyCSSUriRewriterTest extends TestCase
 {
diff --git a/tests/MinifyCacheAPCTest.php b/tests/MinifyCacheAPCTest.php
index 42303b7..447f72b 100644
--- a/tests/MinifyCacheAPCTest.php
+++ b/tests/MinifyCacheAPCTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_Cache_APC;
 
 class MinifyCacheAPCTest extends TestCase
 {
diff --git a/tests/MinifyCacheFileTest.php b/tests/MinifyCacheFileTest.php
index 1817a2b..125485f 100644
--- a/tests/MinifyCacheFileTest.php
+++ b/tests/MinifyCacheFileTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_Cache_File;
 
 class MinifyCacheFileTest extends TestCase
 {
diff --git a/tests/MinifyCacheMemcacheTest.php b/tests/MinifyCacheMemcacheTest.php
index 322720f..6d71c27 100644
--- a/tests/MinifyCacheMemcacheTest.php
+++ b/tests/MinifyCacheMemcacheTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Memcache;
+use Minify_Cache_Memcache;
 
 class MinifyCacheMemcacheTest extends TestCase
 {
diff --git a/tests/MinifyCacheWinCacheTest.php b/tests/MinifyCacheWinCacheTest.php
index cb3f863..4ef00e3 100644
--- a/tests/MinifyCacheWinCacheTest.php
+++ b/tests/MinifyCacheWinCacheTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_Cache_WinCache;
 
 class MinifyCacheWinCacheTest extends TestCase
 {
diff --git a/tests/MinifyCacheZendPlatformTest.php b/tests/MinifyCacheZendPlatformTest.php
index 9aa7fe8..e93f800 100644
--- a/tests/MinifyCacheZendPlatformTest.php
+++ b/tests/MinifyCacheZendPlatformTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_Cache_ZendPlatform;
 
 class MinifyCacheZendPlatformTest extends TestCase
 {
diff --git a/tests/MinifyClosureCompilerTest.php b/tests/MinifyClosureCompilerTest.php
index aa6b671..f933075 100644
--- a/tests/MinifyClosureCompilerTest.php
+++ b/tests/MinifyClosureCompilerTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Exception;
+use Minify_ClosureCompiler;
 
 class MinifyClosureCompilerTest extends TestCase
 {
diff --git a/tests/MinifyCommentPreserverTest.php b/tests/MinifyCommentPreserverTest.php
index 827cd05..77222eb 100644
--- a/tests/MinifyCommentPreserverTest.php
+++ b/tests/MinifyCommentPreserverTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_CommentPreserver;
 
 class MinifyCommentPreserverTest extends TestCase
 {
diff --git a/tests/MinifyHTMLHelperTest.php b/tests/MinifyHTMLHelperTest.php
index dda9983..94e336b 100644
--- a/tests/MinifyHTMLHelperTest.php
+++ b/tests/MinifyHTMLHelperTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_HTML_Helper;
+use Minify_Source;
 
 class MinifyHTMLHelperTest extends TestCase
 {
@@ -42,8 +45,10 @@ class MinifyHTMLHelperTest extends TestCase
         $expected = "/myApp/min/?g=css&amp;{$maxTime}";
         $actual = Minify_HTML_Helper::getUri('css', array(
             'rewriteWorks' => false
-        , 'minAppUri' => '/myApp/min/'
-        , 'groupsConfigFile' => self::$test_files . '/htmlHelper_groupsConfig.php'
+        ,
+            'minAppUri' => '/myApp/min/'
+        ,
+            'groupsConfigFile' => self::$test_files . '/htmlHelper_groupsConfig.php'
         ));
         $this->assertEquals($expected, $actual, 'existing group');
 
@@ -69,7 +74,8 @@ class MinifyHTMLHelperTest extends TestCase
             ));
             $output = Minify_mtime(array(
                 $obj
-            , 'css'
+            ,
+                'css'
             ), self::$test_files . '/htmlHelper_groupsConfig.php');
             $this->assertEquals($maxTime, $output, 'utils.php : Minify_mtime w/ obj & group');
         }
diff --git a/tests/MinifyHTMLTest.php b/tests/MinifyHTMLTest.php
index 6258a7b..42df046 100644
--- a/tests/MinifyHTMLTest.php
+++ b/tests/MinifyHTMLTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_HTML;
 
 class MinifyHTMLTest extends TestCase
 {
diff --git a/tests/MinifyImportProcessorTest.php b/tests/MinifyImportProcessorTest.php
index eab211c..34cdba4 100644
--- a/tests/MinifyImportProcessorTest.php
+++ b/tests/MinifyImportProcessorTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_ImportProcessor;
 
 class MinifyImportProcessorTest extends TestCase
 {
@@ -21,6 +23,7 @@ class MinifyImportProcessorTest extends TestCase
             realpath($linDir . '/lib/css/example.css'),
         );
 
-        $this->assertEquals($expectedIncludes, Minify_ImportProcessor::$filesIncluded, 'included right files in right order');
+        $this->assertEquals($expectedIncludes, Minify_ImportProcessor::$filesIncluded,
+            'included right files in right order');
     }
 }
diff --git a/tests/MinifyLinesTest.php b/tests/MinifyLinesTest.php
index ad6792f..bc30fdf 100644
--- a/tests/MinifyLinesTest.php
+++ b/tests/MinifyLinesTest.php
@@ -1,6 +1,12 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify;
+use Minify_Cache_Null;
+use Minify_Controller_Files;
+use Minify_Env;
+use Minify_Source_Factory;
 
 class MinifyLinesTest extends TestCase
 {
diff --git a/tests/MinifyNailgunClosureCompilerTest.php b/tests/MinifyNailgunClosureCompilerTest.php
index f6de982..1b1dc41 100644
--- a/tests/MinifyNailgunClosureCompilerTest.php
+++ b/tests/MinifyNailgunClosureCompilerTest.php
@@ -1,6 +1,10 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Exception;
+use Minify_ClosureCompiler;
+use Minify_NailgunClosureCompiler;
 
 class MinifyNailgunClosureCompilerTest extends TestCase
 {
diff --git a/tests/MinifyTest.php b/tests/MinifyTest.php
index 213fe55..06d7bc8 100644
--- a/tests/MinifyTest.php
+++ b/tests/MinifyTest.php
@@ -1,6 +1,12 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify;
+use Minify_Cache_Null;
+use Minify_Controller_Files;
+use Minify_Env;
+use Minify_Source_Factory;
 
 class MinifyTest extends TestCase
 {
@@ -148,7 +154,8 @@ class MinifyTest extends TestCase
         ));
         $output = $output['content'];
 
-        $this->assertFalse(strpos($output, $defaultOptions['importWarning']), 'Issue 89 : don\'t warn about valid imports');
+        $this->assertFalse(strpos($output, $defaultOptions['importWarning']),
+            'Issue 89 : don\'t warn about valid imports');
 
         // Test Issue 132
         if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
@@ -158,7 +165,8 @@ class MinifyTest extends TestCase
                 'encodeOutput' => false,
             ));
 
-            $this->assertEquals(77, $output['headers']['Content-Length'], 'Issue 132 : mbstring.func_overload shouldn\'t cause incorrect Content-Length');
+            $this->assertEquals(77, $output['headers']['Content-Length'],
+                'Issue 132 : mbstring.func_overload shouldn\'t cause incorrect Content-Length');
         }
 
         // Test minifying CSS and responding with Etag/Last-Modified
diff --git a/tests/MinifyYuiCSSTest.php b/tests/MinifyYuiCSSTest.php
index 0cba638..b26cb15 100644
--- a/tests/MinifyYuiCSSTest.php
+++ b/tests/MinifyYuiCSSTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Exception;
+use Minify_YUICompressor;
 
 class MinifyYuiCSSTest extends TestCase
 {
@@ -15,7 +18,8 @@ class MinifyYuiCSSTest extends TestCase
         Minify_YUICompressor::$tempDir = sys_get_temp_dir();
     }
 
-    public function setUp() {
+    public function setUp()
+    {
         $this->assertHasJar();
     }
 
@@ -51,7 +55,7 @@ class MinifyYuiCSSTest extends TestCase
     {
         $this->assertNotEmpty(Minify_YUICompressor::$jarFile);
         try {
-            $this->assertFileExists(Minify_YUICompressor::$jarFile , "Have YUI yuicompressor.jar");
+            $this->assertFileExists(Minify_YUICompressor::$jarFile, "Have YUI yuicompressor.jar");
         } catch (Exception $e) {
             $this->markTestSkipped($e->getMessage());
         }
diff --git a/tests/ScssSourceTest.php b/tests/ScssSourceTest.php
index b9099a5..aa2cdf9 100644
--- a/tests/ScssSourceTest.php
+++ b/tests/ScssSourceTest.php
@@ -1,6 +1,8 @@
 <?php
 
-use Minify\Test\TestCase;
+namespace Minify\Test;
+
+use Minify_HTML_Helper;
 
 class ScssSourceTest extends TestCase
 {