diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts
index fa07c4755d6..164296d70e0 100644
--- a/e2e/various-suite/exemplars.spec.ts
+++ b/e2e/various-suite/exemplars.spec.ts
@@ -32,14 +32,14 @@ describe('Exemplars', () => {
   });
 
   it('should be able to navigate to configured data source', () => {
-    let intercept = 'prometheus';
     e2e().intercept('/api/ds/query', (req) => {
-      if (intercept === 'prometheus') {
-        // For second intercept, we want to send tempo response
-        intercept = 'tempo';
+      const datasourceType = req.body.queries[0].datasource.type;
+      if (datasourceType === 'prometheus') {
         req.reply({ fixture: 'exemplars-query-response.json' });
-      } else {
+      } else if (datasourceType === 'tempo') {
         req.reply({ fixture: 'tempo-response.json' });
+      } else {
+        req.reply({});
       }
     });
 
diff --git a/e2e/various-suite/explore.spec.ts b/e2e/various-suite/explore.spec.ts
index 8ba2fede78e..d81db71fce0 100644
--- a/e2e/various-suite/explore.spec.ts
+++ b/e2e/various-suite/explore.spec.ts
@@ -11,7 +11,15 @@ e2e.scenario({
     e2e.pages.Explore.General.container().should('have.length', 1);
     e2e.components.RefreshPicker.runButtonV2().should('have.length', 1);
 
+    // delete query history queries that would be unrelated
+    e2e.components.QueryTab.queryHistoryButton().should('be.visible').click();
+    cy.get('button[title="Delete query"]').each((button) => {
+      button.trigger('click');
+    });
+    e2e.components.QueryTab.queryHistoryButton().should('be.visible').click();
+
     e2e.components.DataSource.TestData.QueryTab.scenarioSelectContainer()
+      .scrollIntoView()
       .should('be.visible')
       .within(() => {
         e2e().get('input[id*="test-data-scenario-select-"]').should('be.visible').click();
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index b2e4c76470f..7bf84b28cb1 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -66,6 +66,12 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
     };
   }
 
+  getDefaultQuery(): Partial<GrafanaQuery> {
+    return {
+      queryType: GrafanaQueryType.RandomWalk,
+    };
+  }
+
   query(request: DataQueryRequest<GrafanaQuery>): Observable<DataQueryResponse> {
     const results: Array<Observable<DataQueryResponse>> = [];
     const targets: GrafanaQuery[] = [];
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index 4fa1f70ba87..c662332e9ee 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -37,6 +37,13 @@ export class TestDataDataSource extends DataSourceWithBackend<TestData> {
     this.variables = new TestDataVariableSupport();
   }
 
+  getDefaultQuery(): Partial<TestData> {
+    return {
+      scenarioId: TestDataQueryType.RandomWalk,
+      seriesCount: 1,
+    };
+  }
+
   query(options: DataQueryRequest<TestData>): Observable<DataQueryResponse> {
     const backendQueries: TestData[] = [];
     const streams: Array<Observable<DataQueryResponse>> = [];