diff --git a/public/test/karma.conf.js b/public/test/karma.conf.js
index fe1206a02c4..d5d67d5218b 100644
--- a/public/test/karma.conf.js
+++ b/public/test/karma.conf.js
@@ -8,11 +8,11 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'src/test/test-main.js',
-      {pattern: 'src/app/**/*.js', included: false},
-      {pattern: 'src/vendor/**/*.js', included: false},
-      {pattern: 'src/test/**/*.js', included: false},
-      {pattern: 'src/**/*.js', included: false}
+      'public/test/test-main.js',
+      {pattern: 'public/app/**/*.js', included: false},
+      {pattern: 'public/vendor/**/*.js', included: false},
+      {pattern: 'public/test/**/*.js', included: false},
+      {pattern: 'public/**/*.js', included: false}
     ],
 
     // list of files to exclude
diff --git a/public/test/test-main.js b/public/test/test-main.js
index d82277725bd..41797787565 100644
--- a/public/test/test-main.js
+++ b/public/test/test-main.js
@@ -1,5 +1,5 @@
 require.config({
-  baseUrl: 'http://localhost:9876/base/src/app',
+  baseUrl: 'http://localhost:9876/base/public/app',
 
   paths: {
     specs:                 '../test/specs',
diff --git a/tasks/options/karma.js b/tasks/options/karma.js
index 0318741a329..630dc19878e 100644
--- a/tasks/options/karma.js
+++ b/tasks/options/karma.js
@@ -1,22 +1,22 @@
 module.exports = function(config) {
   return {
     dev: {
-      configFile: 'src/test/karma.conf.js',
+      configFile: '<%= srcDir %>/test/karma.conf.js',
       singleRun: false,
     },
     debug: {
-      configFile: 'src/test/karma.conf.js',
+      configFile: '<%= srcDir %>/test/karma.conf.js',
       singleRun: false,
       browsers: ['Chrome']
     },
     test: {
-      configFile: 'src/test/karma.conf.js',
+      configFile: '<%= srcDir %>/test/karma.conf.js',
     },
     coveralls: {
-      configFile: 'src/test/karma.conf.js',
+      configFile: '<%= srcDir %>/test/karma.conf.js',
       reporters: ['dots','coverage','coveralls'],
       preprocessors: {
-        'src/app/**/*.js': ['coverage']
+        '<%= srcDir %>/app/**/*.js': ['coverage']
       },
       coverageReporter: {
         type: 'lcov',
diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
index d9edf76ada4..5a785ffce7f 100644
--- a/tasks/options/requirejs.js
+++ b/tasks/options/requirejs.js
@@ -61,7 +61,10 @@ module.exports = function(config,grunt) {
           'controllers/all',
           'routes/all',
           'components/partials',
+          // bundle the datasources
           'plugins/datasource/grafana/datasource',
+          'plugins/datasource/graphite/datasource',
+          'plugins/datasource/influxdb_08/datasource',
         ]
       }
     ];
@@ -69,7 +72,7 @@ module.exports = function(config,grunt) {
     var fs = require('fs');
     var panelPath = config.srcDir+'/app/panels';
 
-    // create a module for each directory in src/app/panels/
+    // create a module for each directory in public/app/panels/
     fs.readdirSync(panelPath).forEach(function (panelName) {
       requireModules[0].include.push('panels/'+panelName+'/module');
       requireModules[0].include.push('text!panels/'+panelName+'/module.html');