Index: Gruntfile.js
===================================================================
--- Gruntfile.js	(revision 26216)
+++ Gruntfile.js	(working copy)
@@ -225,7 +225,18 @@
 			}
 		},
 		qunit: {
-			files: ['tests/qunit/**/*.html']
+			'all': {
+				src: 'tests/qunit/**/*.html',
+				filter: function(filepath){
+					/* If https://github.com/gruntjs/grunt/issues/815 goes in, we can do this cleaner */
+					if ( process.argv[2] === 'qunit' && filepath === 'tests/qunit/index.html' ){
+						return true;
+					} else if ( process.argv[2] !== 'qunit'){
+						return true;
+					}
+					return false
+				}
+			}
 		},
 		phpunit: {
 			'default': {