diff --git a/build/tasks/test.js b/build/tasks/test.js
index 18d396f3..6b93998e 100644
--- a/build/tasks/test.js
+++ b/build/tasks/test.js
@@ -5,7 +5,7 @@ var Server = require('karma').Server;
 /**
  * Run test once and exit
  */
-gulp.task('test', ['inlineTemplates'], function (done) {
+gulp.task('test', ['concatPrism', 'inlineTemplates'], function (done) {
   new Server({
     configFile: __dirname + '/../../karma.conf.js',
     singleRun: true
diff --git a/karma.conf.js b/karma.conf.js
index bf73baac..60e5f73d 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -55,7 +55,7 @@ module.exports = function (config) {
         jspm: {
             config: 'system.config.js',
             loadFiles: ['tests/setup.js', 'tests/helpers.js', 'tests/unit/*.spec.js', 'lib/**/*.js'],
-            serveFiles: ['tests/schemas/**/*.json','tests/schemas/**/*.yml', 'lib/**/*.html', '.tmp/lib/**/*.css'],
+            serveFiles: ['tests/schemas/**/*.json','tests/schemas/**/*.yml', 'lib/**/*.html', '.tmp/*js', '.tmp/lib/**/*.css'],
             nocache: true
         },
 
@@ -65,6 +65,7 @@ module.exports = function (config) {
             '/lib/': '/base/lib/',
             '/jspm_packages/': '/base/jspm_packages/',
             '/node_modules/': '/base/node_modules/',
+            '/prismjs-bundle.js': '/base/.tmp/prismjs-bundle.js',
             '/.tmp/': '/base/.tmp/'
         },
         reporters: travis ? ['mocha', 'coverage', 'coveralls'] : ['mocha', 'coverage'],