diff --git a/Makefile b/Makefile
index baff32e..6ba3f70 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ COMBINE=${PATH_TOOLS}/combine
 .PHONY: combine doc test test-combine
 
 
-default: combine
+default: combine min
 all:     combine doc
 
 # create build dir
diff --git a/test/test-combine.js b/test/test-combine.js
index 79412ec..f76551a 100644
--- a/test/test-combine.js
+++ b/test/test-combine.js
@@ -34,7 +34,8 @@ var common  = require( './common' ),
     };
 
 
-var files = [ 'ease.js', 'ease-full.js' ],
+// test all combined files, including minified files
+var files = [ 'ease.js', 'ease-full.js', 'ease.min.js', 'ease-full.min.js' ],
     file  = '',
     i     = files.length;
 
@@ -52,7 +53,8 @@ while ( i-- )
     {
         // if the file doesn't exit, just skip the test
         console.log(
-            "Combined file not found. Test skipped. Please run `make combined`."
+            "Combined/minified file not found. Test skipped. Please run " +
+            "`make min`."
         );
         process.exit( 0 );
     }
@@ -92,7 +94,7 @@ while ( i-- )
     } );
 
     // the full file has tests included to be run client-side
-    if ( file === 'ease-full.js' )
+    if ( file.match( /ease-full/ ) )
     {
         assert.ok(
             ( typeof sandbox.easejs.runTests === 'function' ),