diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
index a0cb0abf886..61dcf023286 100644
--- a/pkg/cmd/grafana-server/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -21,6 +21,7 @@ import (
 	_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
 	_ "github.com/grafana/grafana/pkg/tsdb/graphite"
 	_ "github.com/grafana/grafana/pkg/tsdb/influxdb"
+	_ "github.com/grafana/grafana/pkg/tsdb/mqe"
 	_ "github.com/grafana/grafana/pkg/tsdb/opentsdb"
 	_ "github.com/grafana/grafana/pkg/tsdb/prometheus"
 	_ "github.com/grafana/grafana/pkg/tsdb/testdata"
diff --git a/pkg/tsdb/mqe/mqe.go b/pkg/tsdb/mqe/mqe.go
new file mode 100644
index 00000000000..1f77c9ab34d
--- /dev/null
+++ b/pkg/tsdb/mqe/mqe.go
@@ -0,0 +1,33 @@
+package mqe
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/tsdb"
+)
+
+type MQEExecutor struct {
+	*tsdb.DataSourceInfo
+}
+
+func NewMQEExecutor(dsInfo *tsdb.DataSourceInfo) tsdb.Executor {
+	return &MQEExecutor{dsInfo}
+}
+
+var (
+	glog       log.Logger
+	HttpClient *http.Client
+)
+
+func init() {
+	glog = log.New("tsdb.mqe")
+	tsdb.RegisterExecutor("mqe", NewMQEExecutor)
+
+	HttpClient = tsdb.GetDefaultClient()
+}
+
+func (e *MQEExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult {
+	return &tsdb.BatchResult{}
+}
diff --git a/pkg/tsdb/mqe/types.go b/pkg/tsdb/mqe/types.go
new file mode 100644
index 00000000000..c6a5b37aeff
--- /dev/null
+++ b/pkg/tsdb/mqe/types.go
@@ -0,0 +1 @@
+package mqe