diff --git a/min_unit_tests/test_Minify_Cache_WinCache.php b/min_unit_tests/test_Minify_Cache_WinCache.php
deleted file mode 100644
index 64fa60e..0000000
--- a/min_unit_tests/test_Minify_Cache_WinCache.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-require_once '_inc.php';
-
-function test_Minify_Cache_WinCache()
-{
-    $prefix = 'Minify_Cache_WinCache : ';
-    if (! function_exists('wincache_ucache_info')) {
-        return;
-    }
-    $data = str_repeat(md5(time()) . 'í', 100); // 3400 bytes in UTF-8
-    $id = 'Minify_test_cache';
-    
-    $cache = new Minify_Cache_WinCache();
-    
-    assertTrue(true === $cache->store($id, $data), $prefix . 'store');
-    
-    assertTrue(countBytes($data) === $cache->getSize($id), $prefix . 'getSize');
-    
-    assertTrue(true === $cache->isValid($id, $_SERVER['REQUEST_TIME'] - 10), $prefix . 'isValid');
-    
-    ob_start();
-    $cache->display($id);
-    $displayed = ob_get_contents();
-    ob_end_clean();
-    
-    assertTrue($data === $displayed, $prefix . 'display');
-    
-    assertTrue($data === $cache->fetch($id), $prefix . 'fetch');
-}
-
-test_Minify_Cache_WinCache();
\ No newline at end of file
diff --git a/min_unit_tests/test_all.php b/min_unit_tests/test_all.php
index d8325e8..7197c4c 100644
--- a/min_unit_tests/test_all.php
+++ b/min_unit_tests/test_all.php
@@ -2,7 +2,6 @@
 
 require 'test_Minify.php';
 require 'test_Minify_HTML_Helper.php';
-require 'test_Minify_Cache_WinCache.php';
 require 'test_Minify_CSS.php';
 require 'test_Minify_CSS_UriRewriter.php';
 require 'test_Minify_HTML.php';
diff --git a/tests/MinifyCacheWinCacheTest.php b/tests/MinifyCacheWinCacheTest.php
new file mode 100644
index 0000000..e6642bd
--- /dev/null
+++ b/tests/MinifyCacheWinCacheTest.php
@@ -0,0 +1,20 @@
+<?php
+
+class MinifyCacheWinCacheTest extends TestCase
+{
+    public function setUp()
+    {
+        if (!function_exists('wincache_ucache_info')) {
+            $this->markTestSkipped("To test this component, install WinCache extension");
+        }
+    }
+
+    public function test1()
+    {
+        $data = str_repeat(md5(time()) . 'í', 100); // 3400 bytes in UTF-8
+        $id = 'Minify_test_cache';
+
+        $cache = new Minify_Cache_WinCache();
+        $this->assertTestCache($cache, $id, $data);
+    }
+}
\ No newline at end of file