diff --git a/test/index.html b/test/index.html
index 1016a16ac..e87730939 100644
--- a/test/index.html
+++ b/test/index.html
@@ -26,7 +26,7 @@
 		</script>
 		<script>
 			// store Lo-Dash to test for bad shim detection
-			var lodashBadShim = _;
+			var lodashBadShim = window._;
 
 			// restore nativeKeys
 			Object.keys = Object._keys;
@@ -54,12 +54,12 @@
 			(function() {
 				var modulePath = ui.buildPath.replace(/\.js$/, '');
 				return {
-					'baseUrl': './',
+					'baseUrl': '../' + (/modularize/.test(QUnit.urlParams.build) ? 'modularize/' : ''),
 					'urlArgs': 't=' + (+new Date),
 					'paths': {
-						'lodash': '../' + modulePath,
-						'shimmed': '../abc/../' + modulePath,
-						'underscore': '../xyz/../' + modulePath
+						'lodash': modulePath,
+						'shimmed': './abc/../' + modulePath,
+						'underscore': './xyz/../' + modulePath
 					},
 					'aliases': [
 						['shimmed', 'lodash'],
diff --git a/test/test-ui.js b/test/test-ui.js
index 0630fb670..37080425b 100644
--- a/test/test-ui.js
+++ b/test/test-ui.js
@@ -23,7 +23,6 @@
       case 'lodash-modern':     return 'dist/lodash.min.js';
       case 'lodash-legacy':     return 'dist/lodash.legacy.min.js';
       case 'lodash-mobile':     return 'dist/lodash.mobile.min.js';
-      case 'lodash-modularize': return 'modularize/lodash.js';
       case 'lodash-underscore': return 'dist/lodash.underscore.min.js';
       case 'lodash-custom-dev': return 'lodash.custom.js';
       case 'lodash-custom':     return 'lodash.custom.min.js';
diff --git a/test/test.js b/test/test.js
index 9b4eb0150..d75424783 100644
--- a/test/test.js
+++ b/test/test.js
@@ -14,7 +14,7 @@
       toString = Object.prototype.toString;
 
   /** Use a single "load" function */
-  var load = typeof require == 'function' ? require : window.load;
+  var load = !amd && typeof require == 'function' ? require : window.load;
 
   /** The file path of the Lo-Dash file to test */
   var filePath = (function() {