diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 4ef6ce7..98425e4 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -20,6 +20,18 @@ module.exports = (grunt) ->
 			'bower_components/pure/pure-min.css'
 			'styles/style.css'
 		]
+		test_scripts: [
+			'bower_components/qunit/qunit/qunit.js'
+			'tests/_setup.js'
+			'tests/services/reader/_factory.js'
+			'tests/services/reader/markdown.js'
+			'tests/services/reader/json.js'
+			'tests/services/transformer.js'
+			'tests/services/poems.js'
+		]
+		test_styles: [
+			'bower_components/qunit/qunit/qunit.css'
+		]
 		min: false
 	}
 
@@ -70,6 +82,7 @@ module.exports = (grunt) ->
 			min: {
 				files: {
 					'build-min/styles.css': ('build/' + style for style in vars.styles)
+					'build-min/test_styles.css': ('build/' + style for style in vars.test_styles)
 				}
 			}
 		}
@@ -96,6 +109,8 @@ module.exports = (grunt) ->
 					data: {
 						scripts: vars.scripts
 						styles: vars.styles
+						test_scripts: vars.test_scripts
+						test_styles: vars.test_styles
 						min: true
 					}
 				}
@@ -105,7 +120,10 @@ module.exports = (grunt) ->
 		qunit: {
 			main: {
 				options: {
-					urls: [ 'http://0.0.0.0:8000/tests.html' ]
+					urls: [
+						'http://0.0.0.0:8000/tests.html'
+						'http://0.0.0.0:8001/tests.html'
+					]
 				}
 			}
 		}
@@ -124,6 +142,7 @@ module.exports = (grunt) ->
 			min: {
 				files: {
 					'build-min/scripts.js': ('build/' + script for script in vars.scripts)
+					'build-min/test_scripts.js': ('build/' + script for script in vars.test_scripts)
 				}
 			}
 		}
@@ -150,8 +169,9 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 
-	grunt.registerTask 'default', [ 'copy:main', 'coffee', 'stylus', 'jade:main' ]
-	grunt.registerTask 'min', [ 'jade:min', 'copy:min', 'uglify', 'cssmin' ]
+	grunt.registerTask 'default', [ 'copy:main', 'coffee:main', 'stylus:main', 'jade:main' ]
+	grunt.registerTask 'min', [ 'jade:min', 'copy:min', 'uglify:min', 'cssmin:min' ]
 
-	grunt.registerTask 'serve', [ 'default', 'min', 'connect', 'watch' ]
-	grunt.registerTask 'test', [ 'default', 'connect:main', 'qunit' ]
+	grunt.registerTask 'serve', [ 'default', 'connect:main', 'watch:main' ]
+	grunt.registerTask 'serve-all', [ 'default', 'min', 'connect', 'watch' ]
+	grunt.registerTask 'test', [ 'default', 'min', 'connect', 'qunit' ]
diff --git a/source/tests.html.jade b/source/tests.html.jade
index 4d873ac..cf24c59 100644
--- a/source/tests.html.jade
+++ b/source/tests.html.jade
@@ -4,18 +4,19 @@ html
 		title Side By Side test suite
 		meta(charset="utf-8")
 
-		for script in scripts
-			script(src="#{script}")
+		if min == true
+			link(rel="stylesheet", type="text/css", href="test_styles.css")
+			script(src="scripts.js")
+			script(src="test_scripts.js")
+		else
+			for script in scripts
+				script(src="#{script}")
 
-		// test scripts
-		link(rel="stylesheet", type="text/css", href="bower_components/qunit/qunit/qunit.css")
-		script(src="bower_components/qunit/qunit/qunit.js")
-		script(src="tests/_setup.js")
-		script(src="tests/services/reader/_factory.js")
-		script(src="tests/services/reader/markdown.js")
-		script(src="tests/services/reader/json.js")
-		script(src="tests/services/transformer.js")
-		script(src="tests/services/poems.js")
+			for script in test_scripts
+				script(src="#{script}")
+
+			for style in test_styles
+				link(rel="stylesheet", type="text/css", href="#{style}")
 
 	body
 		div(id="qunit")