diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js
index 01e9a23651b..b3c03fa42ac 100644
--- a/src/app/routes/backend/all.js
+++ b/src/app/routes/backend/all.js
@@ -49,6 +49,9 @@ define([
       .when('/dashboard/solo/:id/', {
         templateUrl: 'app/partials/solo-panel.html',
         controller : 'SoloPanelCtrl',
+      })
+      .otherwise({
+        templateUrl: 'app/partials/error.html',
       });
   });
 
diff --git a/src/test/specs/soloPanelCtrl-specs.js b/src/test/specs/soloPanelCtrl-specs.js
index db5dc0af979..2e37ee6ca4a 100644
--- a/src/test/specs/soloPanelCtrl-specs.js
+++ b/src/test/specs/soloPanelCtrl-specs.js
@@ -1,6 +1,6 @@
 define([
   'helpers',
-  'controllers/soloPanelCtrl',
+  'features/dashboard/soloPanelCtrl',
   'features/dashboard/dashboardSrv',
 ], function(helpers) {
   'use strict';
diff --git a/src/test/test-main.js b/src/test/test-main.js
index f3b76b362a7..d21f8969dec 100644
--- a/src/test/test-main.js
+++ b/src/test/test-main.js
@@ -138,7 +138,7 @@ require([
     'specs/kbn-format-specs',
     'specs/dashboardSrv-specs',
     'specs/dashboardViewStateSrv-specs',
-    'specs/pro/soloPanelCtrl-specs',
+    'specs/soloPanelCtrl-specs',
   ];
 
   var pluginSpecs = (config.plugins.specs || []).map(function (spec) {