diff --git a/public/app/plugins/panel/test/module.html b/public/app/plugins/panel/test/module.html
deleted file mode 100644
index 10b5eeae608..00000000000
--- a/public/app/plugins/panel/test/module.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2 class="text-center">
-	Test panel!
-	panel.id: {{ctrl.panel.id}}
-	data: {{ctrl.data}}
-</h2>
diff --git a/public/app/plugins/panel/test/module.ts b/public/app/plugins/panel/test/module.ts
deleted file mode 100644
index 21b6479c19a..00000000000
--- a/public/app/plugins/panel/test/module.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-///<reference path="../../../headers/common.d.ts" />
-
-import {PanelDirective, MetricsPanelCtrl} from '../../../features/panel/panel';
-
-function optionsTab() {
-  return {template: '<h2>options!</h2>' };
-}
-
-export class TestPanelCtrl extends MetricsPanelCtrl {
-  data: any;
-
-  constructor($scope, $injector) {
-    super($scope, $injector);
-  }
-
-  refreshData(data) {
-    return this.issueQueries().then(res => {
-      this.data = res.data[0].target;
-      console.log('issueQueries', res);
-    }).catch(err => {
-      console.log('Errrrr! in test panel', err);
-    });
-  }
-}
-
-class TestPanel extends PanelDirective {
-  templateUrl = `app/plugins/panel/test/module.html`;
-  controller = TestPanelCtrl;
-
-  link(scope, elem) {
-    console.log('test panel linking:', scope);
-  }
-}
-
-export {TestPanel as Panel}
diff --git a/public/app/plugins/panel/test/plugin.json b/public/app/plugins/panel/test/plugin.json
deleted file mode 100644
index 08fb883af76..00000000000
--- a/public/app/plugins/panel/test/plugin.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "type": "panel",
-  "name": "Test",
-  "id": "test",
-
-  "info": {
-    "description": "Test panel",
-    "author": {
-      "name": "Core Grafana Team.",
-      "url": "http://grafana.org"
-    },
-    "logos": {
-      "icon": "fa fa-fw th-large",
-      "small": "img/logo_small.png",
-      "large": "img/logo_large.png"
-    }
-  }
-}
diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts
index f546f10c567..bdef3bb4ced 100644
--- a/public/app/plugins/panel/text/module.ts
+++ b/public/app/plugins/panel/text/module.ts
@@ -22,9 +22,7 @@ export class TextPanelCtrl extends PanelCtrl {
 
   initEditMode() {
     this.icon = 'fa fa-text-width';
-    this.addEditorTab('Options', () => {
-      return { templateUrl: 'public/app/plugins/panel/text/editor.html' };
-    });
+    this.addEditorTab('Options', 'public/app/plugins/panel/text/editor.html');
   }
 
   refresh() {