diff --git a/test/index.html b/test/index.html
index e41af9920..3b75bb9e2 100644
--- a/test/index.html
+++ b/test/index.html
@@ -44,6 +44,7 @@
 		<script>
 			// load Lo-Dash as a module
 			var lodashModule,
+			    shimmedModule,
 			    underscoreModule;
 
 			window.require && require({
@@ -51,14 +52,24 @@
 				'urlArgs': 't=' + (+new Date),
 				'paths': {
 					'lodash': '../../' + QUnit.config.lodashFilename,
-					'underscore': './../../' + QUnit.config.lodashFilename
+					'shimmed': './../../' + QUnit.config.lodashFilename,
+					'underscore': '../underscore/../../' + QUnit.config.lodashFilename
+				},
+				'shim': {
+					'shimmed': {
+					    'exports': '_'
+					}
 				}
 			},
-			['lodash', 'underscore'], function(lodash, underscore) {
+			['lodash', 'shimmed', 'underscore'], function(lodash, shimmed, underscore) {
 				if (lodash.noConflict) {
 					lodashModule = lodash.noConflict();
 					lodashModule.moduleName = 'lodash';
 				}
+				if (shimmed.noConflict) {
+					shimmedModule = shimmed.noConflict();
+					shimmedModule.moduleName = 'shimmed';
+				}
 				if (underscore.noConflict) {
 					underscoreModule = underscore.noConflict();
 					underscoreModule.moduleName = 'underscore';
diff --git a/test/test-build.js b/test/test-build.js
index 12588d6e8..67d75ff22 100644
--- a/test/test-build.js
+++ b/test/test-build.js
@@ -422,6 +422,23 @@
 
   /*--------------------------------------------------------------------------*/
 
+  QUnit.module('minified AMD snippet');
+
+  (function() {
+    var start = _.once(QUnit.start);
+
+    asyncTest('`lodash`', function() {
+      build(['-s'], function(source, filepath) {
+        // used by r.js build optimizer
+        var defineHasRegExp = /typeof\s+define\s*==(=)?\s*['"]function['"]\s*&&\s*typeof\s+define\.amd\s*==(=)?\s*['"]object['"]\s*&&\s*define\.amd/g;
+        ok(!!defineHasRegExp.exec(source));
+        start();
+      });
+    });
+  }());
+
+  /*--------------------------------------------------------------------------*/
+
   QUnit.module('strict modifier');
 
   (function() {
diff --git a/test/test.js b/test/test.js
index 4ecdaf24c..80bb2c24e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -123,6 +123,14 @@
       }
     });
 
+    test('supports loading lodash.js with the Require.js "shim" configuration option', function() {
+      if (window.document && window.require) {
+        equal((shimmedModule || {}).moduleName, 'shimmed');
+      } else {
+        skipTest();
+      }
+    });
+
     test('supports loading lodash.js as the "underscore" module', function() {
       if (window.document && window.require) {
         equal((underscoreModule || {}).moduleName, 'underscore');