diff --git a/Gruntfile.js b/Gruntfile.js
index b8dbe9e9..1eece44e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,7 @@ module.exports = function(grunt) {
 
 		mocha: {
 			all: {
-				src: ['test/**/*.html'],
+				src: ['test/*.html'],
 			},
 			options: {
 				run: true
diff --git a/test/ajax/doc-with-scripts.html b/test/ajax/doc-with-scripts.html
new file mode 100644
index 00000000..8e5fa6d6
--- /dev/null
+++ b/test/ajax/doc-with-scripts.html
@@ -0,0 +1,27 @@
+<div>
+
+Lorem ipsum dolor sit amet
+
+<script type="text/javascript">
+    // set global var
+    var unitTestVariable1 = true;
+</script>
+
+Lorem ipsum dolor sit amet
+
+<script type="text/javascript">
+    // set another global var
+    var unitTestVariable2 = true;
+</script>
+
+<script type="text/javascript">
+    // set global var
+    if (typeof scriptCount == 'undefined')
+        var scriptCount = 1;
+    else
+        scriptCount++;
+</script>
+
+Lorem ipsum dolor sit amet
+
+</div>
diff --git a/test/ajax/json.json b/test/ajax/json.json
new file mode 100644
index 00000000..d5dad436
--- /dev/null
+++ b/test/ajax/json.json
@@ -0,0 +1 @@
+{ "name": "jquery-test" }
\ No newline at end of file
diff --git a/test/ajax/json.txt b/test/ajax/json.txt
new file mode 100644
index 00000000..d5dad436
--- /dev/null
+++ b/test/ajax/json.txt
@@ -0,0 +1 @@
+{ "name": "jquery-test" }
\ No newline at end of file
diff --git a/test/ajax/script.txt b/test/ajax/script.txt
new file mode 100644
index 00000000..99c5849e
--- /dev/null
+++ b/test/ajax/script.txt
@@ -0,0 +1,3 @@
+formScriptTest = function() {
+    // no-op
+}
diff --git a/test/ajax/test.xml b/test/ajax/test.xml
new file mode 100644
index 00000000..b16b62da
--- /dev/null
+++ b/test/ajax/test.xml
@@ -0,0 +1,5 @@
+<root>
+    <test></test>
+    <test></test>
+    <test></test>
+</root>
\ No newline at end of file
diff --git a/test/ajax/text.html b/test/ajax/text.html
new file mode 100644
index 00000000..c06ef4b8
--- /dev/null
+++ b/test/ajax/text.html
@@ -0,0 +1,12 @@
+Lorem ipsum dolor sit amet
+consectetuer adipiscing elit
+Sed lorem leo
+lorem leo consectetuer adipiscing elit
+Sed lorem leo
+rhoncus sit amet
+elementum at
+bibendum at, eros
+Cras at mi et tortor egestas vestibulum
+sed Cras at mi vestibulum
+Phasellus sed felis sit amet
+orci dapibus semper.
diff --git a/test/test.html b/test/test.html
index 25d1d559..07d12e3e 100644
--- a/test/test.html
+++ b/test/test.html
@@ -14,7 +14,7 @@
 	<!-- Test HTML -->
 	<div id="main" style="display: none;">
 		<!-- form1 -->
-		<form id="form1" action="text.php" method="get">
+		<form id="form1" action="ajax/text.html" method="get">
 			<div>
 				<input type="hidden" name="Hidden" value="hiddenValue">
 				<input name="Name" type="text" value="MyName1">
@@ -66,7 +66,7 @@
 		</form>
 
 		<!-- form2 -->
-		<form id="form2" action="text.php" method="get">
+		<form id="form2" action="ajax/text.html" method="get">
 			<div>
 				<input name="a" type="text">
 				<textarea name="b" rows="1" cols="1"></textarea>
@@ -79,34 +79,34 @@
 		</form>
 
 		<!-- form3 -->
-		<form id="form3" action="text.php" method="post">
+		<form id="form3" action="ajax/text.html" method="post">
 			<div>
 				<input name="a" type="text">
 			</div>
 		</form>
 
 		<!-- form4 -->
-		<form id="form4" action="text.php" method="get">
+		<form id="form4" action="ajax/text.html" method="get">
 			<div>
 				<input name="a" type="text">
 				<input type="submit" id="submitForm4">
 				<input type="submit" id="submitForm4withName" name="form4inputName">
-				<input type="image"  id="form4imageSubmit" name="myImage" src="submit.gif">
+				<input type="image"  id="form4imageSubmit" name="myImage" src="img/submit.gif">
 			</div>
 		</form>
 
 		<!-- form5 -->
-		<form id="form5" action="text.php?test=form" method="get">
+		<form id="form5" action="ajax/text.html?test=form" method="get">
 			<div>
 				<input name="a" type="text">
 				<input type="submit">
 				<input type="submit" name="form5inputName">
-				<input type="image"  id="form5imageSubmit" name="myImage" src="submit.gif">
+				<input type="image"  id="form5imageSubmit" name="myImage" src="img/submit.gif">
 			</div>
 		</form>
 
 		<!-- form6, 'option' testing -->
-		<form id="form6" action="text.php" method="get">
+		<form id="form6" action="ajax/text.html" method="get">
 			<div>
 				<select name="A">
 					<option value="" selected="selected">EMPTY_STRING</option>	<!-- TEST A: value === empty string -->
@@ -122,20 +122,20 @@
 		</form>
 
 		<!-- form7, 'enctype' testing -->
-		<form id="form7" action="text.php" method="post" enctype="text/css">
+		<form id="form7" action="ajax/text.html" method="post" enctype="text/css">
 			<div>
 				<textarea name="doc">body { padding: 0}</textarea>
 			</div>
 		</form>
 
-		<form id="form8" action="text.php" method="post">
+		<form id="form8" action="ajax/text.html" method="post">
 			<div>
 				<textarea name="ta">blah</textarea>
 				<input type="submit" id="submitForm8">
 			</div>
 		</form>
 
-		<form id="form9" action="text.php" method="post">
+		<form id="form9" action="ajax/text.html" method="post">
 			<div>
 				<textarea name="ta">blah</textarea>
 				<input type="submit" id="submitForm9">
@@ -160,7 +160,7 @@
 			<input type="submit" value="button">
 		</div>
 
-		<form style="display:none" id="fieldTest" action="text.php" method="post">
+		<form style="display:none" id="fieldTest" action="ajax/text.html" method="post">
 			<div>
 				<select name="A">
 					<option value="1" selected="selected">ONE</option>
diff --git a/test/test.js b/test/test.js
index 070e8dfb..13bd9431 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,4 +1,4 @@
-/* global chai */
+/* global chai, scriptCount */
 
 'use strict';
 
@@ -39,7 +39,7 @@ describe('form', function() {
 
 	it('"action" and "method" form attributes', function() {
 		var f = $('#form1');
-		assert.strictEqual(f.attr('action'), 'text.php', 'form "action"');
+		assert.strictEqual(f.attr('action'), 'ajax/text.html', 'form "action"');
 		assert.strictEqual(f.attr('method'), 'get', 'form "method"');
 	});
 
@@ -212,7 +212,6 @@ describe('form', function() {
 		assert.ok(!el.checked, 'success: ' + el.checked);
 	});
 
-
 	// test clearForm
 	it('clearForm (radio)', function() {
 		var el = $('#form1 input:radio:checked')[0];
@@ -283,7 +282,7 @@ describe('form', function() {
 
 		var opts = {
 			target: '#targetDiv',
-			url:	'doc-with-scripts.html?' + new Date().getTime(),
+			url:	'ajax/doc-with-scripts.html?' + new Date().getTime(),
 			success: function(responseText) { // post-callback
 				assert.ok(true, 'success-callback');
 				assert.ok($('#targetDiv').text().match('Lorem ipsum'), 'targetDiv updated');
@@ -367,7 +366,7 @@ describe('form', function() {
 		// stop();
 
 		var opts = {
-			url: 'json.json',
+			url: 'ajax/json.json',
 			dataType: 'json',
 			success: function(data, statusText) { // post-submit callback
 				// assert that the json data was evaluated
@@ -387,7 +386,7 @@ describe('form', function() {
 		// stop();
 
 		var opts = {
-			url: 'script.txt?' + new Date().getTime(), // don't let ie cache it
+			url: 'ajax/script.txt?' + new Date().getTime(), // don't let ie cache it
 			dataType: 'script',
 			success: function(responseText, statusText) { // post-submit callback
 				assert.ok(typeof formScriptTest == 'function', 'script evaluated');
@@ -405,7 +404,7 @@ describe('form', function() {
 		// stop();
 
 		var opts = {
-			url: 'test.xml',
+			url: 'ajax/test.xml',
 			dataType: 'xml',
 			success: function(responseXML, statusText) { // post-submit callback
 				assert.ok(typeof responseXML == 'object', 'data type xml');
@@ -471,7 +470,7 @@ describe('form', function() {
 			},
 			// url and method must be provided for a pseudo form since they can
 			// not be extracted from the markup
-			url:  'text.php',
+			url:  'ajax/text.html',
 			type: 'post'
 		};
 
@@ -490,7 +489,7 @@ describe('form', function() {
 				assert.ok(data.name == 'jquery-test', 'evaled response');
 				// start();
 			},
-			url: 'json.txt'
+			url: 'ajax/json.txt'
 		};
 
 		// expect(2);
@@ -617,7 +616,7 @@ describe('form', function() {
 		// stop();
 
 		var opts = {
-			url: 'bogus.php',
+			url: 'ajax/404.html',
 			error: function() {
 				assert.ok(true, 'error-callback');
 				// start();