diff --git a/min_unit_tests/test_JSMin.php b/min_unit_tests/test_JSMin.php
deleted file mode 100644
index a3836b9..0000000
--- a/min_unit_tests/test_JSMin.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-require_once '_inc.php';
-
-use JSMin\JSMin;
-
-function test_JSMin()
-{
-    global $thisDir;
-   
-    $src = file_get_contents($thisDir . '/_test_files/js/before.js');
-    $minExpected = file_get_contents($thisDir . '/_test_files/js/before.min.js');
-    $minOutput = JSMin::minify($src);
-    assertTrue($minExpected == $minOutput, 'JSMin : Overall');
-    if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
-        echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
-        echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";
-        echo "---Source: " .countBytes($src). " bytes\n\n{$src}\n\n\n";
-    }
-
-    $src = file_get_contents($thisDir . '/_test_files/js/issue144.js');
-    $minExpected = file_get_contents($thisDir . '/_test_files/js/issue144.min.js');
-    $minOutput = JSMin::minify($src);
-    assertTrue($minExpected == $minOutput, 'JSMin : Handle "+ ++a" syntax (Issue 144)');
-    if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
-        echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
-        echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";
-        echo "---Source: " .countBytes($src). " bytes\n\n{$src}\n\n\n";
-    }
-
-    $src = file_get_contents($thisDir . '/_test_files/js/issue256.js');
-    $minExpected = file_get_contents($thisDir . '/_test_files/js/issue256.min.js');
-    $minOutput = JSMin::minify($src);
-    assertTrue($minExpected == $minOutput, 'JSMin : Handle \n!function()... (Issue 256)');
-    if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
-        echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
-        echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";
-        echo "---Source: " .countBytes($src). " bytes\n\n{$src}\n\n\n";
-    }
-
-    if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
-        $src = file_get_contents($thisDir . '/_test_files/js/issue132.js');
-        $minExpected = file_get_contents($thisDir . '/_test_files/js/issue132.min.js');
-        $minOutput = JSMin::minify($src);
-        assertTrue($minExpected == $minOutput, 'JSMin : mbstring.func_overload shouldn\'t cause failure (Issue 132)');
-        if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
-            echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
-            echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";
-            echo "---Source: " .countBytes($src). " bytes\n\n{$src}\n\n\n";
-        }
-    }
-
-    $src = file_get_contents($thisDir . '/_test_files/js/regexes.js');
-    $minExpected = file_get_contents($thisDir . '/_test_files/js/regexes.min.js');
-    $minOutput = JSMin::minify($src);
-    assertTrue($minExpected == $minOutput, 'JSMin : Identify RegExp literals');
-    if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
-        echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
-        echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";
-        echo "---Source: " .countBytes($src). " bytes\n\n{$src}\n\n\n";
-    }
-
-    test_JSMin_exception('"Hello'
-                        ,'Unterminated String'
-                        ,'JSMin\UnterminatedStringException'
-                        ,"JSMin: Unterminated String at byte 5: \"Hello");
-
-    test_JSMin_exception("return /regexp\n}"
-                        ,'Unterminated RegExp'
-                        ,'JSMin\UnterminatedRegExpException'
-                        ,"JSMin: Unterminated RegExp at byte 14: /regexp\n");
-    test_JSMin_exception("return/regexp\n}"
-                        ,'Unterminated RegExp'
-                        ,'JSMin\UnterminatedRegExpException'
-                        ,"JSMin: Unterminated RegExp at byte 13: /regexp\n");
-    test_JSMin_exception(";return/regexp\n}"
-                        ,'Unterminated RegExp'
-                        ,'JSMin\UnterminatedRegExpException'
-                        ,"JSMin: Unterminated RegExp at byte 14: /regexp\n");
-    test_JSMin_exception(";return /regexp\n}"
-                        ,'Unterminated RegExp'
-                        ,'JSMin\UnterminatedRegExpException'
-                        ,"JSMin: Unterminated RegExp at byte 15: /regexp\n");
-
-    test_JSMin_exception("typeof/regexp\n}"
-                        ,'Unterminated RegExp'
-                        ,'JSMin\UnterminatedRegExpException'
-                        ,"JSMin: Unterminated RegExp at byte 13: /regexp\n");
-
-    test_JSMin_exception("/* Comment "
-                        ,'Unterminated Comment'
-                        ,'JSMin\UnterminatedCommentException'
-                        ,"JSMin: Unterminated comment at byte 11: /* Comment ");
-}
-
-function test_JSMin_exception($js, $label, $expClass, $expMessage) {
-    $eClass = $eMsg = '';
-    try {
-        JSMin::minify($js);
-    } catch (Exception $e) {
-        $eClass = get_class($e);
-        $eMsg = $e->getMessage();
-    }
-    $passed = assertTrue($eClass === $expClass && $eMsg === $expMessage, 
-        'JSMin : throw on ' . $label);
-    if (! $passed && isset($e) && (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME']))) {
-        echo "\n  ---" , $e, "\n\n";
-    }
-}
-
-test_JSMin();
diff --git a/tests/JSMinTest.php b/tests/JSMinTest.php
new file mode 100644
index 0000000..70e03a9
--- /dev/null
+++ b/tests/JSMinTest.php
@@ -0,0 +1,133 @@
+<?php
+
+use JSMin\JSMin;
+
+class JsMinTest extends PHPUnit_Framework_TestCase
+{
+    /** @var string */
+    static $test_files;
+
+    public static function setupBeforeClass()
+    {
+        self::$test_files = __DIR__ . '/../min_unit_tests/_test_files';
+    }
+
+    public function test1()
+    {
+        $src = file_get_contents(self::$test_files . '/js/before.js');
+        $minExpected = file_get_contents(self::$test_files . '/js/before.min.js');
+        $minOutput = JSMin::minify($src);
+        $this->assertSame($minExpected, $minOutput, 'Overall');
+    }
+
+    public function test2()
+    {
+        $src = file_get_contents(self::$test_files . '/js/issue144.js');
+        $minExpected = file_get_contents(self::$test_files . '/js/issue144.min.js');
+        $minOutput = JSMin::minify($src);
+        $this->assertSame($minExpected, $minOutput, 'Handle "+ ++a" syntax (Issue 144)');
+    }
+
+    public function test3()
+    {
+        $src = file_get_contents(self::$test_files . '/js/issue256.js');
+        $minExpected = file_get_contents(self::$test_files . '/js/issue256.min.js');
+        $minOutput = JSMin::minify($src);
+        $this->assertSame($minExpected, $minOutput, 'Handle \n!function()... (Issue 256)');
+    }
+
+    public function test4()
+    {
+        $have_overload = function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2);
+        if (!$have_overload) {
+            $this->markTestSkipped();
+        }
+
+        $src = file_get_contents(self::$test_files . '/js/issue132.js');
+        $minExpected = file_get_contents(self::$test_files . '/js/issue132.min.js');
+        $minOutput = JSMin::minify($src);
+        $this->assertSame($minExpected, $minOutput, 'mbstring.func_overload shouldn\'t cause failure (Issue 132)');
+    }
+
+    public function test5()
+    {
+        $src = file_get_contents(self::$test_files . '/js/regexes.js');
+        $minExpected = file_get_contents(self::$test_files . '/js/regexes.min.js');
+        $minOutput = JSMin::minify($src);
+        $this->assertSame($minExpected, $minOutput, 'Identify RegExp literals');
+    }
+
+    /**
+     * @param string $js
+     * @param string $label
+     * @param string $expClass
+     * @param string $expMessage
+     * @dataProvider testJSMinExceptionData
+     */
+    public function testJSMinException($js, $label, $expClass, $expMessage)
+    {
+        $eClass = $eMsg = '';
+        try {
+            JSMin::minify($js);
+        } catch (Exception $e) {
+            $eClass = get_class($e);
+            $eMsg = $e->getMessage();
+        }
+        $this->assertTrue($eClass === $expClass && $eMsg === $expMessage, 'Throw on ' . $label);
+    }
+
+    public function testJSMinExceptionData()
+    {
+        // $js, $label, $expClass, $expMessage
+        return array(
+            array(
+                '"Hello',
+                'Unterminated String',
+                'JSMin\UnterminatedStringException',
+                "JSMin: Unterminated String at byte 5: \"Hello",
+            ),
+
+            array(
+                "return /regexp\n}",
+                'Unterminated RegExp',
+                'JSMin\UnterminatedRegExpException',
+                "JSMin: Unterminated RegExp at byte 14: /regexp\n",
+            ),
+
+            array(
+                "return/regexp\n}",
+                'Unterminated RegExp',
+                'JSMin\UnterminatedRegExpException',
+                "JSMin: Unterminated RegExp at byte 13: /regexp\n",
+            ),
+
+            array(
+                ";return/regexp\n}",
+                'Unterminated RegExp',
+                'JSMin\UnterminatedRegExpException',
+                "JSMin: Unterminated RegExp at byte 14: /regexp\n",
+            ),
+
+            array(
+                ";return /regexp\n}",
+                'Unterminated RegExp',
+                'JSMin\UnterminatedRegExpException',
+                "JSMin: Unterminated RegExp at byte 15: /regexp\n",
+            ),
+
+            array(
+                "typeof/regexp\n}",
+                'Unterminated RegExp',
+                'JSMin\UnterminatedRegExpException',
+                "JSMin: Unterminated RegExp at byte 13: /regexp\n",
+            ),
+
+            array(
+                "/* Comment ",
+                'Unterminated Comment',
+                'JSMin\UnterminatedCommentException',
+                "JSMin: Unterminated comment at byte 11: /* Comment ",
+            ),
+        );
+    }
+}
\ No newline at end of file