diff --git a/src/plugins/vis_type_vega/public/__mocks__/services.ts b/src/plugins/vis_type_vega/public/__mocks__/services.ts
deleted file mode 100644
index 4775241a66d505..00000000000000
--- a/src/plugins/vis_type_vega/public/__mocks__/services.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { CoreStart, IUiSettingsClient, NotificationsStart, SavedObjectsStart } from 'kibana/public';
-
-import { createGetterSetter } from '../../../kibana_utils/public';
-import { DataPublicPluginStart } from '../../../data/public';
-import { dataPluginMock } from '../../../data/public/mocks';
-import { coreMock } from '../../../../core/public/mocks';
-
-export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
-setData(dataPluginMock.createStartContract());
-
-export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
-  'Notifications'
-);
-setNotifications(coreMock.createStart().notifications);
-
-export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
-setUISettings(coreMock.createStart().uiSettings);
-
-export const [getInjectedMetadata, setInjectedMetadata] = createGetterSetter<
-  CoreStart['injectedMetadata']
->('InjectedMetadata');
-setInjectedMetadata(coreMock.createStart().injectedMetadata);
-
-export const [getSavedObjects, setSavedObjects] = createGetterSetter<SavedObjectsStart>(
-  'SavedObjects'
-);
-setSavedObjects(coreMock.createStart().savedObjects);
-
-export const [getInjectedVars, setInjectedVars] = createGetterSetter<{
-  enableExternalUrls: boolean;
-  emsTileLayerId: unknown;
-}>('InjectedVars');
-setInjectedVars({
-  emsTileLayerId: {},
-  enableExternalUrls: true,
-});
-
-export const getEnableExternalUrls = () => getInjectedVars().enableExternalUrls;
-export const getEmsTileLayerId = () => getInjectedVars().emsTileLayerId;
diff --git a/src/plugins/vis_type_vega/public/__test__/default.spec.json b/src/plugins/vis_type_vega/public/test_utils/default.spec.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/__test__/default.spec.json
rename to src/plugins/vis_type_vega/public/test_utils/default.spec.json
diff --git a/src/plugins/vis_type_vega/public/__test__/vega_graph.json b/src/plugins/vis_type_vega/public/test_utils/vega_graph.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/__test__/vega_graph.json
rename to src/plugins/vis_type_vega/public/test_utils/vega_graph.json
diff --git a/src/plugins/vis_type_vega/public/__test__/vega_map_test.json b/src/plugins/vis_type_vega/public/test_utils/vega_map_test.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/__test__/vega_map_test.json
rename to src/plugins/vis_type_vega/public/test_utils/vega_map_test.json
diff --git a/src/plugins/vis_type_vega/public/__test__/vegalite_graph.json b/src/plugins/vis_type_vega/public/test_utils/vegalite_graph.json
similarity index 100%
rename from src/plugins/vis_type_vega/public/__test__/vegalite_graph.json
rename to src/plugins/vis_type_vega/public/test_utils/vegalite_graph.json
diff --git a/src/plugins/vis_type_vega/public/vega_visualization.test.js b/src/plugins/vis_type_vega/public/vega_visualization.test.js
index d81cb7abd3f3dd..a6ad6e4908bb48 100644
--- a/src/plugins/vis_type_vega/public/vega_visualization.test.js
+++ b/src/plugins/vis_type_vega/public/vega_visualization.test.js
@@ -23,9 +23,9 @@ import 'leaflet/dist/leaflet.js';
 import 'leaflet-vega';
 import { createVegaVisualization } from './vega_visualization';
 
-import vegaliteGraph from './__test__/vegalite_graph.json';
-import vegaGraph from './__test__/vega_graph.json';
-import vegaMapGraph from './__test__/vega_map_test.json';
+import vegaliteGraph from './test_utils/vegalite_graph.json';
+import vegaGraph from './test_utils/vega_graph.json';
+import vegaMapGraph from './test_utils/vega_map_test.json';
 
 import { VegaParser } from './data_model/vega_parser';
 import { SearchAPI } from './data_model/search_api';
@@ -44,7 +44,7 @@ import { dataPluginMock } from '../../data/public/mocks';
 import { KibanaMap } from '../../maps_legacy/public/map/kibana_map';
 
 jest.mock('./default_spec', () => ({
-  getDefaultSpec: () => jest.requireActual('./__test__/default.spec.json'),
+  getDefaultSpec: () => jest.requireActual('./test_utils/default.spec.json'),
 }));
 
 jest.mock('./lib/vega', () => ({
@@ -88,17 +88,9 @@ describe('VegaVisualizations', () => {
 
   beforeEach(() => {
     vegaVisualizationDependencies = {
-      core: {
-        uiSettings: coreStart.uiSettings,
-      },
+      core: coreMock.createSetup(),
       plugins: {
-        data: {
-          query: {
-            timefilter: {
-              timefilter: {},
-            },
-          },
-        },
+        data: dataPluginMock.createSetupContract(),
       },
     };