Gruntfile.js

@@ -841,11 +841,20 @@ module.exports = function( grunt ) {
 							.forEach( function( suite ) {
 								testDirs.forEach( function( dir ) {
 									dir = "tests/" + dir;
-									patterns = patterns.concat([
-										dir + "/" + suite + "/index.html",
-										dir + "/" + suite + "/*/index.html",
-										dir + "/" + suite + "/**/*-tests.html"
-									]);
+
+									if ( suite.indexOf( "/" ) >= 0 ) {
+
+										// If the suite is a path, then append it exactly
+										patterns.push( dir + "/" + suite );
+									} else {
+
+										// If not, append all patterns we care about
+										patterns = patterns.concat([
+											dir + "/" + suite + "/index.html",
+											dir + "/" + suite + "/*/index.html",
+											dir + "/" + suite + "/**/*-tests.html"
+										]);
+									}
 								});
 							});
 

tests/integration/navigation/navigation_core.js

@@ -200,7 +200,9 @@ $.testHelper.delayStart();
 				// wait for the scrollstop to fire and for the scroll to be
 				// recorded 100 ms afterward (see changes made to handle hash
 				// scrolling in some browsers)
-				setTimeout( navigateTestRoot, 500 );
+				setTimeout( function() {
+					$.mobile.changePage( "external-scroll-test.html" );
+				}, 500 );
 			},
 
 			function(){
@@ -212,9 +214,11 @@ $.testHelper.delayStart();
 				setTimeout(function() {
 					deepEqual( $(window).scrollTop(), 300, "scrollTop is 300 after returning to the page" );
 					$( "body" ).height( "" );
-					start();
+					history.back();
 				}, 300 );
-			}
+			},
+
+			start
 		]);
 	});
 
@@ -229,7 +233,7 @@ $.testHelper.delayStart();
 			function(){
 				$.mobile.changePage = newChangePage;
 
- 				$('#non-ajax-form').one('submit', function(event){
+				$('#non-ajax-form').one('submit', function(event){
 					ok(true, 'submit callbacks are fired');
 					event.preventDefault();
 				}).submit();