diff --git a/karma.conf.js b/karma.conf.js
index 47aa3f059b..16175556ae 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -34,7 +34,6 @@ module.exports = function(config) {
         // List of files / patterns to load in the browser.
         // By default, files are also included in a script tag.
         files: [
-            '**/moment*',
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'platform/**/*.js', included: false},
             {pattern: 'warp/**/*.js', included: false},
diff --git a/test-main.js b/test-main.js
index 46740a93b2..d3bbb1fcc3 100644
--- a/test-main.js
+++ b/test-main.js
@@ -44,7 +44,14 @@ require.config({
 
     paths: {
         'es6-promise': 'platform/framework/lib/es6-promise-2.0.0.min',
-        'moment-duration-format': 'warp/clock/lib/moment-duration-format'
+        'moment': 'platform/telemetry/lib/moment.min',
+        'moment-duration-format': 'platform/features/clock/lib/moment-duration-format'
+    },
+
+    shim: {
+        'moment-duration-format': {
+            deps: [ 'moment' ]
+        }
     },
 
     // dynamically load all test files