diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
index 9e57fc4c36876..19f62a7d48923 100644
--- a/src/core/MIGRATION.md
+++ b/src/core/MIGRATION.md
@@ -1170,7 +1170,7 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
 | `import 'ui/query_bar'`                           | `import { QueryStringInput } from '../data/public'`          | Directives are deprecated.                                                                                                           |
 | `import 'ui/search_bar'`                          | `import { SearchBar } from '../data/public'`                 | Directive is deprecated.                                                                                                             |
 | `import 'ui/kbn_top_nav'`                         | `import { TopNavMenu } from '../navigation/public'`          | Directive is still available in `ui/kbn_top_nav`.                                                                                    |
-| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../kibana_react/public'` |                                                                                                                                      |
+| `ui/saved_objects/components/saved_object_finder` | `import { SavedObjectFinder } from '../saved_objects/public'` |                                                                                                                                      |
 | `core_plugins/interpreter`                        | `data.expressions`                                           | still in progress                                                                                                                    |
 | `ui/courier`                                      | `data.search`                                                | still in progress                                                                                                                    |
 | `ui/embeddable`                                   | `embeddables`                                                | still in progress                                                                                                                    |
diff --git a/src/legacy/ui/public/saved_objects/__tests__/simple_saved_object.js b/src/core/public/saved_objects/simple_saved_object.test.ts
similarity index 67%
rename from src/legacy/ui/public/saved_objects/__tests__/simple_saved_object.js
rename to src/core/public/saved_objects/simple_saved_object.test.ts
index f2fc9bfe232e2..99676f6b78d42 100644
--- a/src/legacy/ui/public/saved_objects/__tests__/simple_saved_object.js
+++ b/src/core/public/saved_objects/simple_saved_object.test.ts
@@ -17,36 +17,43 @@
  * under the License.
  */
 
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import { SimpleSavedObject } from '../../../../../core/public';
+import { SavedObject } from '../../server';
+import { SimpleSavedObject } from './simple_saved_object';
+import { SavedObjectsClientContract } from './saved_objects_client';
 
 describe('SimpleSavedObject', () => {
+  let client: SavedObjectsClientContract;
+
+  beforeEach(() => {
+    client = {
+      update: jest.fn(),
+      create: jest.fn(),
+      delete: jest.fn(),
+    } as any;
+  });
+
   it('persists type and id', () => {
     const id = 'logstash-*';
     const type = 'index-pattern';
 
-    const client = sinon.stub();
-    const savedObject = new SimpleSavedObject(client, { id, type });
+    const savedObject = new SimpleSavedObject(client, { id, type } as SavedObject);
 
-    expect(savedObject.id).to.be(id);
-    expect(savedObject.type).to.be(type);
+    expect(savedObject.id).toEqual(id);
+    expect(savedObject.type).toEqual(type);
   });
 
   it('persists attributes', () => {
     const attributes = { title: 'My title' };
 
-    const client = sinon.stub();
-    const savedObject = new SimpleSavedObject(client, { attributes });
+    const savedObject = new SimpleSavedObject(client, { attributes } as SavedObject);
 
-    expect(savedObject.attributes).to.be(attributes);
+    expect(savedObject.attributes).toEqual(attributes);
   });
 
   it('persists version', () => {
-    const version = 2;
+    const version = '2';
 
-    const client = sinon.stub();
-    const savedObject = new SimpleSavedObject(client, { version });
-    expect(savedObject._version).to.be(version);
+    const savedObject = new SimpleSavedObject(client, { version } as SavedObject);
+    expect(savedObject._version).toEqual(version);
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index d5198dc557f04..c1f679e9eb7ac 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -24,7 +24,6 @@
  * directly where they are needed.
  */
 
-export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 export { KbnUrl } from 'ui/url/kbn_url';
@@ -33,7 +32,6 @@ export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_to
 // @ts-ignore
 export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url/index';
 export { IInjector } from 'ui/chrome';
-export { SavedObjectLoader } from 'ui/saved_objects';
 export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
 export {
   configureAppAngularModule,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index cc104c1a931d0..7239d8f2258a7 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -38,7 +38,6 @@ import {
   PrivateProvider,
   PromiseServiceCreator,
   RedirectWhenMissingProvider,
-  SavedObjectLoader,
 } from '../legacy_imports';
 // @ts-ignore
 import { initDashboardApp } from './legacy_app';
@@ -47,6 +46,7 @@ import { NavigationPublicPluginStart as NavigationStart } from '../../../../../.
 import { DataPublicPluginStart } from '../../../../../../plugins/data/public';
 import { SharePluginStart } from '../../../../../../plugins/share/public';
 import { KibanaLegacyStart } from '../../../../../../plugins/kibana_legacy/public';
+import { SavedObjectLoader } from '../../../../../../plugins/saved_objects/public';
 
 export interface RenderDeps {
   pluginInitializerContext: PluginInitializerContext;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 465203be0d34c..075516d52bab6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -26,9 +26,10 @@ import angular from 'angular';
 import { Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { History } from 'history';
+import { SavedObjectSaveOpts } from 'src/plugins/saved_objects/public';
 import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
 
-import { migrateLegacyQuery, SavedObjectSaveOpts, subscribeWithScope } from '../legacy_imports';
+import { migrateLegacyQuery, subscribeWithScope } from '../legacy_imports';
 import {
   esFilters,
   IndexPattern,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
index d80208ce27ffe..db2b1f15247de 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
@@ -18,7 +18,7 @@
  */
 
 import { TimefilterContract } from 'src/plugins/data/public';
-import { SavedObjectSaveOpts } from '../../legacy_imports';
+import { SavedObjectSaveOpts } from '../../../../../../../plugins/saved_objects/public';
 import { updateSavedDashboard } from './update_saved_dashboard';
 import { DashboardStateManager } from '../dashboard_state_manager';
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
index 5babaf8061de9..c5ac05b5a77eb 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import {
+  createSavedObjectClass,
+  SavedObject,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { extractReferences, injectReferences } from './saved_dashboard_references';
 
 import {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
index 4ece5d46358ba..2ff76da9c5ca6 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
@@ -17,8 +17,10 @@
  * under the License.
  */
 
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import {
+  SavedObjectLoader,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { createSavedDashboardClass } from './saved_dashboard';
 
 export function createSavedDashboardLoader(services: SavedObjectKibanaServices) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts b/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts
index 113d13287bd12..7bd0eef8c19af 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/_saved_search.ts
@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+
+import {
+  createSavedObjectClass,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 
 export function createSavedSearchClass(services: SavedObjectKibanaServices) {
   const SavedObjectClass = createSavedObjectClass(services);
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts
index 0b34652461026..ebd341eba99fd 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts
@@ -16,8 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+
+import {
+  SavedObjectLoader,
+  SavedObjectKibanaServices,
+} from '../../../../../../plugins/saved_objects/public';
 import { createSavedSearchClass } from './_saved_search';
 
 export function createSavedSearchesLoader(services: SavedObjectKibanaServices) {
diff --git a/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts b/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
index 0a6ac20502669..e0756b2e78e25 100644
--- a/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
+++ b/src/legacy/core_plugins/kibana/public/management/saved_object_registry.ts
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
-import { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
 import { createSavedDashboardLoader } from '../dashboard';
 import { createSavedSearchesLoader } from '../discover';
 import { TypesService, createSavedVisLoader } from '../../../visualizations/public';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/render.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/render.test.js
index af580547b11ed..1b9dafb6daf23 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/render.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/render.test.js
@@ -50,6 +50,7 @@ describe('CreateIndexPatternWizardRender', () => {
       config: {},
       changeUrl: () => {},
       indexPatternCreationType: {},
+      openConfirm: jest.fn(),
     });
 
     expect(render.mock.calls.length).toBe(1);
diff --git a/src/legacy/core_plugins/timelion/public/directives/saved_object_save_as_checkbox.html b/src/legacy/core_plugins/timelion/public/directives/saved_object_save_as_checkbox.html
index 3e4a1526113c3..5adce4286010a 100644
--- a/src/legacy/core_plugins/timelion/public/directives/saved_object_save_as_checkbox.html
+++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_save_as_checkbox.html
@@ -5,7 +5,7 @@
     i18n-id="timelion.savedObjects.howToSaveAsNewDescription"
     i18n-default-message="In previous versions of Kibana, changing the name of a {savedObjectName} would make a copy with the new name. Use the 'Save as a new {savedObjectName}' checkbox to do this now."
     i18n-values="{ savedObjectName: savedObject.getDisplayName() }"
-    i18n-description="'Save as a new {savedObjectName}' refers to common.ui.savedObjects.saveAsNewLabel and should be the same text."
+    i18n-description="'Save as a new {savedObjectName}' refers to timelion.savedObjects.saveAsNewLabel and should be the same text."
   ></div>
 
   <label class="kuiCheckBoxLabel kuiVerticalRhythmSmall">
diff --git a/src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts b/src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts
index 1e956cbd3e5ac..4e5aa8d445e7d 100644
--- a/src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts
+++ b/src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
 import { IUiSettingsClient } from 'kibana/public';
+import {
+  createSavedObjectClass,
+  SavedObjectKibanaServices,
+} from '../../../../../plugins/saved_objects/public';
 
 // Used only by the savedSheets service, usually no reason to change this
 export function createSavedSheetClass(
diff --git a/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts b/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
index 074431bf28da8..201b21f932988 100644
--- a/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
+++ b/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 import { npStart } from 'ui/new_platform';
-import { SavedObjectLoader } from 'ui/saved_objects';
 // @ts-ignore
 import { uiModules } from 'ui/modules';
+import { SavedObjectLoader } from '../../../../../plugins/saved_objects/public';
 import { createSavedSheetClass } from './_saved_sheet';
 
 const module = uiModules.get('app/sheet');
diff --git a/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts
index e7ca5ea803701..4c6c12f825609 100644
--- a/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts
+++ b/src/legacy/core_plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -22,7 +22,6 @@ import { PersistedState } from 'ui/persisted_state';
 import { Subscription } from 'rxjs';
 import * as Rx from 'rxjs';
 import { buildPipeline } from 'ui/visualize/loader/pipeline_helpers';
-import { SavedObject } from 'ui/saved_objects/types';
 import { npStart } from 'ui/new_platform';
 import { IExpressionLoaderParams } from 'src/plugins/expressions/public';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
@@ -44,6 +43,7 @@ import {
   SELECT_RANGE_TRIGGER,
 } from '../../../../../plugins/embeddable/public';
 import { dispatchRenderComplete } from '../../../../../plugins/kibana_utils/public';
+import { SavedObject } from '../../../../../plugins/saved_objects/public';
 import { SavedSearch } from '../../../kibana/public/discover/np_ready/types';
 import { Vis } from '../np_ready/public';
 
diff --git a/src/legacy/core_plugins/visualizations/public/saved_visualizations/_saved_vis.ts b/src/legacy/core_plugins/visualizations/public/saved_visualizations/_saved_vis.ts
index 8b8c5fe94cc95..f4548da375216 100644
--- a/src/legacy/core_plugins/visualizations/public/saved_visualizations/_saved_vis.ts
+++ b/src/legacy/core_plugins/visualizations/public/saved_visualizations/_saved_vis.ts
@@ -24,8 +24,11 @@
  *
  * NOTE: It's a type of SavedObject, but specific to visualizations.
  */
-import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import {
+  createSavedObjectClass,
+  SavedObject,
+  SavedObjectKibanaServices,
+} from '../../../../../plugins/saved_objects/public';
 import { updateOldState } from '../index';
 import { extractReferences, injectReferences } from './saved_visualization_references';
 import { IIndexPattern } from '../../../../../plugins/data/public';
diff --git a/src/legacy/core_plugins/visualizations/public/saved_visualizations/saved_visualizations.ts b/src/legacy/core_plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
index 4b2a8e27c0208..7d0d6a10ff66f 100644
--- a/src/legacy/core_plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
+++ b/src/legacy/core_plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObjectLoader } from 'ui/saved_objects';
-import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import {
+  SavedObjectLoader,
+  SavedObjectKibanaServices,
+} from '../../../../../plugins/saved_objects/public';
 
 // @ts-ignore
 import { findListItems } from './find_list_items';
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 2d5cc72597ec4..bbd5de68523e2 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -103,6 +103,7 @@ const createStartContract = (): Start => {
           fetchForWildcard: jest.fn(),
         },
       }),
+      get: jest.fn().mockReturnValue(Promise.resolve({})),
     } as unknown) as IndexPatternsContract,
   };
   return startContract;
diff --git a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
index 06e56aaf3eb0a..b7f5be1d82b3e 100644
--- a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
@@ -190,6 +190,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
               },
               "getSuggestions": [MockFunction],
               "indexPatterns": Object {
+                "get": [MockFunction],
                 "make": [Function],
               },
               "query": Object {
@@ -845,6 +846,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
                       },
                       "getSuggestions": [MockFunction],
                       "indexPatterns": Object {
+                        "get": [MockFunction],
                         "make": [Function],
                       },
                       "query": Object {
@@ -1482,6 +1484,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
               },
               "getSuggestions": [MockFunction],
               "indexPatterns": Object {
+                "get": [MockFunction],
                 "make": [Function],
               },
               "query": Object {
@@ -2134,6 +2137,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
                       },
                       "getSuggestions": [MockFunction],
                       "indexPatterns": Object {
+                        "get": [MockFunction],
                         "make": [Function],
                       },
                       "query": Object {
@@ -2771,6 +2775,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
               },
               "getSuggestions": [MockFunction],
               "indexPatterns": Object {
+                "get": [MockFunction],
                 "make": [Function],
               },
               "query": Object {
@@ -3423,6 +3428,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
                       },
                       "getSuggestions": [MockFunction],
                       "indexPatterns": Object {
+                        "get": [MockFunction],
                         "make": [Function],
                       },
                       "query": Object {
diff --git a/src/plugins/saved_objects/kibana.json b/src/plugins/saved_objects/kibana.json
new file mode 100644
index 0000000000000..4081c9a4b21b9
--- /dev/null
+++ b/src/plugins/saved_objects/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "savedObjects",
+  "version": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": []
+}
diff --git a/src/legacy/ui/public/saved_objects/constants.ts b/src/plugins/saved_objects/public/constants.ts
similarity index 83%
rename from src/legacy/ui/public/saved_objects/constants.ts
rename to src/plugins/saved_objects/public/constants.ts
index e1684aa1d19d5..59b8d058bd570 100644
--- a/src/legacy/ui/public/saved_objects/constants.ts
+++ b/src/plugins/saved_objects/public/constants.ts
@@ -22,18 +22,15 @@ import { i18n } from '@kbn/i18n';
  * An error message to be used when the user rejects a confirm overwrite.
  * @type {string}
  */
-export const OVERWRITE_REJECTED = i18n.translate(
-  'common.ui.savedObjects.overwriteRejectedDescription',
-  {
-    defaultMessage: 'Overwrite confirmation was rejected',
-  }
-);
+export const OVERWRITE_REJECTED = i18n.translate('savedObjects.overwriteRejectedDescription', {
+  defaultMessage: 'Overwrite confirmation was rejected',
+});
 /**
  * An error message to be used when the user rejects a confirm save with duplicate title.
  * @type {string}
  */
 export const SAVE_DUPLICATE_REJECTED = i18n.translate(
-  'common.ui.savedObjects.saveDuplicateRejectedDescription',
+  'savedObjects.saveDuplicateRejectedDescription',
   {
     defaultMessage: 'Save with duplicate title confirmation was rejected',
   }
diff --git a/src/plugins/saved_objects/public/index.ts b/src/plugins/saved_objects/public/index.ts
index 5dae8b055d2db..ea92c921efad0 100644
--- a/src/plugins/saved_objects/public/index.ts
+++ b/src/plugins/saved_objects/public/index.ts
@@ -17,5 +17,11 @@
  * under the License.
  */
 
+import { SavedObjectsPublicPlugin } from './plugin';
+
 export { OnSaveProps, SavedObjectSaveModal, SaveResult, showSaveModal } from './save_modal';
 export { getSavedObjectFinder, SavedObjectFinderUi, SavedObjectMetaData } from './finder';
+export { SavedObjectLoader, createSavedObjectClass } from './saved_object';
+export { SavedObjectSaveOpts, SavedObjectKibanaServices, SavedObject } from './types';
+
+export const plugin = () => new SavedObjectsPublicPlugin();
diff --git a/src/plugins/saved_objects/public/plugin.ts b/src/plugins/saved_objects/public/plugin.ts
new file mode 100644
index 0000000000000..e937c271b6faf
--- /dev/null
+++ b/src/plugins/saved_objects/public/plugin.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { Plugin } from 'src/core/public';
+
+export class SavedObjectsPublicPlugin implements Plugin {
+  public setup() {}
+  public start() {}
+}
diff --git a/src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
similarity index 91%
rename from src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
index ee49b7495f2af..2e965eaf1989b 100644
--- a/src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/apply_es_resp.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 import _ from 'lodash';
-import { EsResponse, SavedObject, SavedObjectConfig } from 'ui/saved_objects/types';
-import { parseSearchSource } from 'ui/saved_objects/helpers/parse_search_source';
-import { expandShorthand, SavedObjectNotFound } from '../../../../../plugins/kibana_utils/public';
-import { IndexPattern } from '../../../../../plugins/data/public';
+import { EsResponse, SavedObject, SavedObjectConfig } from '../../types';
+import { parseSearchSource } from './parse_search_source';
+import { expandShorthand, SavedObjectNotFound } from '../../../../kibana_utils/public';
+import { IndexPattern } from '../../../../data/public';
 
 /**
  * A given response of and ElasticSearch containing a plain saved object is applied to the given
diff --git a/src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts
similarity index 98%
rename from src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts
index 7cd9a151a443d..b9043890e2775 100644
--- a/src/legacy/ui/public/saved_objects/helpers/build_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/build_saved_object.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import _ from 'lodash';
-import { SearchSource } from '../../../../../plugins/data/public';
+import { SearchSource } from '../../../../data/public';
 import { hydrateIndexPattern } from './hydrate_index_pattern';
 import { intializeSavedObject } from './initialize_saved_object';
 import { serializeSavedObject } from './serialize_saved_object';
@@ -28,7 +28,7 @@ import {
   SavedObjectConfig,
   SavedObjectKibanaServices,
   SavedObjectSaveOpts,
-} from '../types';
+} from '../../types';
 import { applyESResp } from './apply_es_resp';
 import { saveSavedObject } from './save_saved_object';
 
diff --git a/src/legacy/ui/public/saved_objects/helpers/check_for_duplicate_title.ts b/src/plugins/saved_objects/public/saved_object/helpers/check_for_duplicate_title.ts
similarity index 95%
rename from src/legacy/ui/public/saved_objects/helpers/check_for_duplicate_title.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/check_for_duplicate_title.ts
index 5c1c1d0d9a851..8895336aa9ffa 100644
--- a/src/legacy/ui/public/saved_objects/helpers/check_for_duplicate_title.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/check_for_duplicate_title.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObject, SavedObjectKibanaServices } from '../types';
+import { SavedObject, SavedObjectKibanaServices } from '../../types';
 import { findObjectByTitle } from './find_object_by_title';
-import { SAVE_DUPLICATE_REJECTED } from '../constants';
+import { SAVE_DUPLICATE_REJECTED } from '../../constants';
 import { displayDuplicateTitleConfirmModal } from './display_duplicate_title_confirm_modal';
 
 /**
diff --git a/src/legacy/ui/public/saved_objects/helpers/confirm_modal_promise.tsx b/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
similarity index 86%
rename from src/legacy/ui/public/saved_objects/helpers/confirm_modal_promise.tsx
rename to src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
index 1e0a4f4ebe47f..bb16acad1aa06 100644
--- a/src/legacy/ui/public/saved_objects/helpers/confirm_modal_promise.tsx
+++ b/src/plugins/saved_objects/public/saved_object/helpers/confirm_modal_promise.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import { OverlayStart } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 import { EuiConfirmModal } from '@elastic/eui';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../kibana_react/public';
 
 export function confirmModalPromise(
   message = '',
@@ -29,12 +29,9 @@ export function confirmModalPromise(
   overlays: OverlayStart
 ): Promise<true> {
   return new Promise((resolve, reject) => {
-    const cancelButtonText = i18n.translate(
-      'common.ui.savedObjects.confirmModal.cancelButtonLabel',
-      {
-        defaultMessage: 'Cancel',
-      }
-    );
+    const cancelButtonText = i18n.translate('savedObjects.confirmModal.cancelButtonLabel', {
+      defaultMessage: 'Cancel',
+    });
 
     const modal = overlays.openModal(
       toMountPoint(
diff --git a/src/legacy/ui/public/saved_objects/helpers/create_source.ts b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
similarity index 85%
rename from src/legacy/ui/public/saved_objects/helpers/create_source.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
index 1818671cecebe..25ed4d527b833 100644
--- a/src/legacy/ui/public/saved_objects/helpers/create_source.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/create_source.ts
@@ -18,9 +18,9 @@
  */
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
 import { SavedObjectAttributes } from 'kibana/public';
-import { OVERWRITE_REJECTED } from 'ui/saved_objects/constants';
+import { SavedObject, SavedObjectKibanaServices } from '../../types';
+import { OVERWRITE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
 
 /**
@@ -52,23 +52,20 @@ export async function createSource(
     // record exists, confirm overwriting
     if (_.get(err, 'res.status') === 409) {
       const confirmMessage = i18n.translate(
-        'common.ui.savedObjects.confirmModal.overwriteConfirmationMessage',
+        'savedObjects.confirmModal.overwriteConfirmationMessage',
         {
           defaultMessage: 'Are you sure you want to overwrite {title}?',
           values: { title: savedObject.title },
         }
       );
 
-      const title = i18n.translate('common.ui.savedObjects.confirmModal.overwriteTitle', {
+      const title = i18n.translate('savedObjects.confirmModal.overwriteTitle', {
         defaultMessage: 'Overwrite {name}?',
         values: { name: savedObject.getDisplayName() },
       });
-      const confirmButtonText = i18n.translate(
-        'common.ui.savedObjects.confirmModal.overwriteButtonLabel',
-        {
-          defaultMessage: 'Overwrite',
-        }
-      );
+      const confirmButtonText = i18n.translate('savedObjects.confirmModal.overwriteButtonLabel', {
+        defaultMessage: 'Overwrite',
+      });
 
       return confirmModalPromise(confirmMessage, title, confirmButtonText, overlays)
         .then(() =>
diff --git a/src/legacy/ui/public/saved_objects/helpers/display_duplicate_title_confirm_modal.ts b/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
similarity index 79%
rename from src/legacy/ui/public/saved_objects/helpers/display_duplicate_title_confirm_modal.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
index 36882db72d56c..0b02977830fda 100644
--- a/src/legacy/ui/public/saved_objects/helpers/display_duplicate_title_confirm_modal.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/display_duplicate_title_confirm_modal.ts
@@ -18,29 +18,26 @@
  */
 import { i18n } from '@kbn/i18n';
 import { OverlayStart } from 'kibana/public';
-import { SAVE_DUPLICATE_REJECTED } from '../constants';
+import { SAVE_DUPLICATE_REJECTED } from '../../constants';
 import { confirmModalPromise } from './confirm_modal_promise';
-import { SavedObject } from '../types';
+import { SavedObject } from '../../types';
 
 export function displayDuplicateTitleConfirmModal(
   savedObject: SavedObject,
   overlays: OverlayStart
 ): Promise<true> {
   const confirmMessage = i18n.translate(
-    'common.ui.savedObjects.confirmModal.saveDuplicateConfirmationMessage',
+    'savedObjects.confirmModal.saveDuplicateConfirmationMessage',
     {
       defaultMessage: `A {name} with the title '{title}' already exists. Would you like to save anyway?`,
       values: { title: savedObject.title, name: savedObject.getDisplayName() },
     }
   );
 
-  const confirmButtonText = i18n.translate(
-    'common.ui.savedObjects.confirmModal.saveDuplicateButtonLabel',
-    {
-      defaultMessage: 'Save {name}',
-      values: { name: savedObject.getDisplayName() },
-    }
-  );
+  const confirmButtonText = i18n.translate('savedObjects.confirmModal.saveDuplicateButtonLabel', {
+    defaultMessage: 'Save {name}',
+    values: { name: savedObject.getDisplayName() },
+  });
   try {
     return confirmModalPromise(confirmMessage, '', confirmButtonText, overlays);
   } catch (_) {
diff --git a/src/legacy/ui/public/saved_objects/__tests__/find_object_by_title.js b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
similarity index 72%
rename from src/legacy/ui/public/saved_objects/__tests__/find_object_by_title.js
rename to src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
index b0e110ede2c80..c88e06ce2119e 100644
--- a/src/legacy/ui/public/saved_objects/__tests__/find_object_by_title.js
+++ b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.test.ts
@@ -17,37 +17,35 @@
  * under the License.
  */
 
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import { findObjectByTitle } from '../helpers/find_object_by_title';
-import { SimpleSavedObject } from '../../../../../core/public';
+import { findObjectByTitle } from './find_object_by_title';
+import {
+  SimpleSavedObject,
+  SavedObjectsClientContract,
+  SavedObject,
+} from '../../../../../core/public';
 
 describe('findObjectByTitle', () => {
-  const sandbox = sinon.createSandbox();
-  const savedObjectsClient = {};
+  const savedObjectsClient: SavedObjectsClientContract = {} as SavedObjectsClientContract;
 
   beforeEach(() => {
-    savedObjectsClient.find = sandbox.stub();
+    savedObjectsClient.find = jest.fn();
   });
 
-  afterEach(() => sandbox.restore());
-
   it('returns undefined if title is not provided', async () => {
-    const match = await findObjectByTitle(savedObjectsClient, 'index-pattern');
-    expect(match).to.be(undefined);
+    const match = await findObjectByTitle(savedObjectsClient, 'index-pattern', '');
+    expect(match).toBeUndefined();
   });
 
   it('matches any case', async () => {
     const indexPattern = new SimpleSavedObject(savedObjectsClient, {
       attributes: { title: 'foo' },
-    });
-    savedObjectsClient.find.returns(
+    } as SavedObject);
+    savedObjectsClient.find = jest.fn().mockImplementation(() =>
       Promise.resolve({
         savedObjects: [indexPattern],
       })
     );
-
     const match = await findObjectByTitle(savedObjectsClient, 'index-pattern', 'FOO');
-    expect(match).to.eql(indexPattern);
+    expect(match).toEqual(indexPattern);
   });
 });
diff --git a/src/legacy/ui/public/saved_objects/helpers/find_object_by_title.ts b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
similarity index 90%
rename from src/legacy/ui/public/saved_objects/helpers/find_object_by_title.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
index 373800f576627..0f1c08930db5e 100644
--- a/src/legacy/ui/public/saved_objects/helpers/find_object_by_title.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/find_object_by_title.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 
-import { SavedObjectAttributes } from 'src/core/server';
-import { SavedObjectsClientContract } from 'src/core/public';
-import { SimpleSavedObject } from 'src/core/public';
+import {
+  SavedObjectsClientContract,
+  SimpleSavedObject,
+  SavedObjectAttributes,
+} from '../../../../../core/public';
 
 /**
  * Returns an object matching a given title
diff --git a/src/legacy/ui/public/saved_objects/helpers/hydrate_index_pattern.ts b/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
similarity index 92%
rename from src/legacy/ui/public/saved_objects/helpers/hydrate_index_pattern.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
index a78b3f97e884b..b55538e4073ba 100644
--- a/src/legacy/ui/public/saved_objects/helpers/hydrate_index_pattern.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/hydrate_index_pattern.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObject, SavedObjectConfig } from '../types';
-import { IndexPatternsContract } from '../../../../../plugins/data/public';
+import { SavedObject, SavedObjectConfig } from '../../types';
+import { IndexPatternsContract } from '../../../../data/public';
 
 /**
  * After creation or fetching from ES, ensure that the searchSources index indexPattern
diff --git a/src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
similarity index 96%
rename from src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
index a9d4b416add1e..ae8d7ac8a6526 100644
--- a/src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/initialize_saved_object.ts
@@ -18,7 +18,7 @@
  */
 import _ from 'lodash';
 import { SavedObjectsClientContract } from 'kibana/public';
-import { SavedObject, SavedObjectConfig } from '../types';
+import { SavedObject, SavedObjectConfig } from '../../types';
 
 /**
  * Initialize saved object
diff --git a/src/legacy/ui/public/saved_objects/helpers/parse_search_source.ts b/src/plugins/saved_objects/public/saved_object/helpers/parse_search_source.ts
similarity index 94%
rename from src/legacy/ui/public/saved_objects/helpers/parse_search_source.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/parse_search_source.ts
index b194420fc1cd0..cdb191f9e7df8 100644
--- a/src/legacy/ui/public/saved_objects/helpers/parse_search_source.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/parse_search_source.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 import _ from 'lodash';
-import { migrateLegacyQuery } from '../../../../../plugins/kibana_legacy/public';
-import { SavedObject } from '../types';
-import { InvalidJSONProperty } from '../../../../../plugins/kibana_utils/public';
+import { migrateLegacyQuery } from '../../../../kibana_legacy/public';
+import { SavedObject } from '../../types';
+import { InvalidJSONProperty } from '../../../../kibana_utils/public';
 
 export function parseSearchSource(
   savedObject: SavedObject,
diff --git a/src/legacy/ui/public/saved_objects/helpers/save_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts
similarity index 99%
rename from src/legacy/ui/public/saved_objects/helpers/save_saved_object.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts
index bd6daa1832a25..e43619c2692a5 100644
--- a/src/legacy/ui/public/saved_objects/helpers/save_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/save_saved_object.ts
@@ -21,8 +21,8 @@ import {
   SavedObjectConfig,
   SavedObjectKibanaServices,
   SavedObjectSaveOpts,
-} from '../types';
-import { OVERWRITE_REJECTED, SAVE_DUPLICATE_REJECTED } from '../constants';
+} from '../../types';
+import { OVERWRITE_REJECTED, SAVE_DUPLICATE_REJECTED } from '../../constants';
 import { createSource } from './create_source';
 import { checkForDuplicateTitle } from './check_for_duplicate_title';
 
diff --git a/src/legacy/ui/public/saved_objects/helpers/serialize_saved_object.ts b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
similarity index 96%
rename from src/legacy/ui/public/saved_objects/helpers/serialize_saved_object.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
index ca780f8f9584d..8a020ca03aea3 100644
--- a/src/legacy/ui/public/saved_objects/helpers/serialize_saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/serialize_saved_object.ts
@@ -18,8 +18,8 @@
  */
 import _ from 'lodash';
 import angular from 'angular';
-import { SavedObject, SavedObjectConfig } from '../types';
-import { expandShorthand } from '../../../../../plugins/kibana_utils/public';
+import { SavedObject, SavedObjectConfig } from '../../types';
+import { expandShorthand } from '../../../../kibana_utils/public';
 
 export function serializeSavedObject(savedObject: SavedObject, config: SavedObjectConfig) {
   // mapping definition for the fields that this object will expose
diff --git a/src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts b/src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts
similarity index 99%
rename from src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts
index 5b108a4cc0180..b71173f3a089d 100644
--- a/src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts
+++ b/src/plugins/saved_objects/public/saved_object/helpers/string_utils.test.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { StringUtils } from './string_utils';
 
 describe('StringUtils class', () => {
diff --git a/src/legacy/ui/public/saved_objects/helpers/string_utils.ts b/src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts
similarity index 100%
rename from src/legacy/ui/public/saved_objects/helpers/string_utils.ts
rename to src/plugins/saved_objects/public/saved_object/helpers/string_utils.ts
diff --git a/src/legacy/ui/public/saved_objects/index.ts b/src/plugins/saved_objects/public/saved_object/index.ts
similarity index 92%
rename from src/legacy/ui/public/saved_objects/index.ts
rename to src/plugins/saved_objects/public/saved_object/index.ts
index 03c5a64fdd45e..d3be5ea6df617 100644
--- a/src/legacy/ui/public/saved_objects/index.ts
+++ b/src/plugins/saved_objects/public/saved_object/index.ts
@@ -17,5 +17,5 @@
  * under the License.
  */
 
+export { createSavedObjectClass } from './saved_object';
 export { SavedObjectLoader } from './saved_object_loader';
-export { findObjectByTitle } from './helpers/find_object_by_title';
diff --git a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
similarity index 52%
rename from src/legacy/ui/public/saved_objects/__tests__/saved_object.js
rename to src/plugins/saved_objects/public/saved_object/saved_object.test.ts
index d027d8b6c99da..08389e9e3c97f 100644
--- a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
+++ b/src/plugins/saved_objects/public/saved_object/saved_object.test.ts
@@ -17,25 +17,32 @@
  * under the License.
  */
 
-import ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
 import Bluebird from 'bluebird';
-
-import { createSavedObjectClass } from '../saved_object';
+import { createSavedObjectClass } from './saved_object';
+import {
+  SavedObject,
+  SavedObjectConfig,
+  SavedObjectKibanaServices,
+  SavedObjectSaveOpts,
+} from '../types';
+
+// @ts-ignore
 import StubIndexPattern from 'test_utils/stub_index_pattern';
-import { npStart } from 'ui/new_platform';
-import { InvalidJSONProperty } from '../../../../../plugins/kibana_utils/public';
-import { npSetup, npStart as npStartMock } from '../../new_platform/new_platform.karma_mock';
+import { InvalidJSONProperty } from '../../../kibana_utils/public';
+import { coreMock } from '../../../../core/public/mocks';
+import { dataPluginMock } from '../../../../plugins/data/public/mocks';
+import { SavedObjectAttributes, SimpleSavedObject } from 'kibana/public';
+import { IIndexPattern } from '../../../data/common/index_patterns';
 
-const getConfig = cfg => cfg;
+const getConfig = (cfg: any) => cfg;
 
-describe('Saved Object', function() {
-  require('test_utils/no_digest_promises').activateForSuite();
+describe('Saved Object', () => {
+  const startMock = coreMock.createStart();
+  const dataStartMock = dataPluginMock.createStartContract();
+  const saveOptionsMock = {} as SavedObjectSaveOpts;
 
-  let SavedObject;
-  let savedObjectsClientStub;
-  let window;
+  let SavedObjectClass: new (config: SavedObjectConfig) => SavedObject;
+  const savedObjectsClientStub = startMock.savedObjects.client;
 
   /**
    * Returns a fake doc response with the given index and id, of type dashboard
@@ -44,31 +51,41 @@ describe('Saved Object', function() {
    * @param additionalOptions - object that will be assigned to the mocked doc response.
    * @returns {{attributes: {}, type: string, id: *, _version: string}}
    */
-  function getMockedDocResponse(indexPatternId, additionalOptions = {}) {
+  function getMockedDocResponse(indexPatternId: string, additionalOptions = {}) {
     return {
       type: 'dashboard',
       id: indexPatternId,
       _version: 'foo',
       attributes: {},
       ...additionalOptions,
-    };
+    } as SimpleSavedObject<SavedObjectAttributes>;
   }
 
   /**
    * Stubs some of the es retrieval calls so it returns the given response.
    * @param {Object} mockDocResponse
    */
-  function stubESResponse(mockDocResponse) {
+  function stubESResponse(mockDocResponse: SimpleSavedObject<SavedObjectAttributes>) {
     // Stub out search for duplicate title:
-    sinon.stub(savedObjectsClientStub, 'get').returns(Bluebird.resolve(mockDocResponse));
-    sinon.stub(savedObjectsClientStub, 'update').returns(Bluebird.resolve(mockDocResponse));
-
-    sinon
-      .stub(savedObjectsClientStub, 'find')
-      .returns(Bluebird.resolve({ savedObjects: [], total: 0 }));
-    sinon
-      .stub(savedObjectsClientStub, 'bulkGet')
-      .returns(Bluebird.resolve({ savedObjects: [mockDocResponse] }));
+    savedObjectsClientStub.get = jest.fn().mockReturnValue(Bluebird.resolve(mockDocResponse));
+    savedObjectsClientStub.update = jest.fn().mockReturnValue(Bluebird.resolve(mockDocResponse));
+
+    savedObjectsClientStub.find = jest
+      .fn()
+      .mockReturnValue(Bluebird.resolve({ savedObjects: [], total: 0 }));
+
+    savedObjectsClientStub.bulkGet = jest
+      .fn()
+      .mockReturnValue(Bluebird.resolve({ savedObjects: [mockDocResponse] }));
+  }
+
+  function stubSavedObjectsClientCreate(
+    resp: SimpleSavedObject<SavedObjectAttributes> | string,
+    resolve = true
+  ) {
+    savedObjectsClientStub.create = jest
+      .fn()
+      .mockReturnValue(resolve ? Bluebird.resolve(resp) : Bluebird.reject(resp));
   }
 
   /**
@@ -79,168 +96,138 @@ describe('Saved Object', function() {
    * @returns {Promise<SavedObject>} A promise that resolves with an instance of
    * SavedObject
    */
-  function createInitializedSavedObject(config = {}) {
-    const savedObject = new SavedObject(config);
+  function createInitializedSavedObject(config: SavedObjectConfig = {}) {
+    const savedObject = new SavedObjectClass(config);
     savedObject.title = 'my saved object';
-    return savedObject.init();
-  }
-
-  function restoreIfWrapped(obj, fName) {
-    obj[fName].restore && obj[fName].restore();
+    return savedObject.init!();
   }
 
   beforeEach(() => {
-    // Use the native window.confirm instead of our specialized version to make testing
-    // this easier.
-    npStartMock.core.overlays.openModal = message =>
-      window.confirm(message) ? Promise.resolve() : Promise.reject();
+    SavedObjectClass = createSavedObjectClass({
+      savedObjectsClient: savedObjectsClientStub,
+      indexPatterns: dataStartMock.indexPatterns,
+    } as SavedObjectKibanaServices);
   });
 
-  beforeEach(
-    ngMock.inject(function($window) {
-      savedObjectsClientStub = npStart.core.savedObjects.client;
-      SavedObject = createSavedObjectClass({ savedObjectsClient: savedObjectsClientStub });
-      window = $window;
-    })
-  );
-
-  afterEach(
-    ngMock.inject(function() {
-      restoreIfWrapped(savedObjectsClientStub, 'create');
-      restoreIfWrapped(savedObjectsClientStub, 'get');
-      restoreIfWrapped(savedObjectsClientStub, 'update');
-      restoreIfWrapped(savedObjectsClientStub, 'find');
-      restoreIfWrapped(savedObjectsClientStub, 'bulkGet');
-    })
-  );
-
-  describe('save', function() {
-    describe('with confirmOverwrite', function() {
-      function stubConfirmOverwrite() {
-        window.confirm = sinon.stub().returns(true);
-      }
-
-      it('when false does not request overwrite', function() {
-        const mockDocResponse = getMockedDocResponse('myId');
-        stubESResponse(mockDocResponse);
+  describe('save', () => {
+    describe('with confirmOverwrite', () => {
+      it('when false does not request overwrite', () => {
+        stubESResponse(getMockedDocResponse('myId'));
 
         return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
-          stubConfirmOverwrite();
-
-          sinon.stub(savedObjectsClientStub, 'create').returns(Bluebird.resolve({ id: 'myId' }));
+          stubSavedObjectsClientCreate({ id: 'myId' } as SimpleSavedObject<SavedObjectAttributes>);
 
           return savedObject.save({ confirmOverwrite: false }).then(() => {
-            expect(window.confirm.called).to.be(false);
+            expect(startMock.overlays.openModal).not.toHaveBeenCalled();
           });
         });
       });
     });
 
-    describe('with copyOnSave', function() {
-      it('as true creates a copy on save success', function() {
-        const mockDocResponse = getMockedDocResponse('myId');
-        stubESResponse(mockDocResponse);
-        return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
-          sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-            return Bluebird.resolve({ type: 'dashboard', id: 'newUniqueId' });
-          });
+    describe('with copyOnSave', () => {
+      it('as true creates a copy on save success', () => {
+        stubESResponse(getMockedDocResponse('myId'));
 
+        return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
+          stubSavedObjectsClientCreate({
+            type: 'dashboard',
+            id: 'newUniqueId',
+          } as SimpleSavedObject<SavedObjectAttributes>);
           savedObject.copyOnSave = true;
-          return savedObject.save().then(id => {
-            expect(id).to.be('newUniqueId');
+
+          return savedObject.save(saveOptionsMock).then(id => {
+            expect(id).toBe('newUniqueId');
           });
         });
       });
 
-      it('as true does not create a copy when save fails', function() {
+      it('as true does not create a copy when save fails', () => {
         const originalId = 'id1';
-        const mockDocResponse = getMockedDocResponse(originalId);
-        stubESResponse(mockDocResponse);
+        stubESResponse(getMockedDocResponse(originalId));
+
         return createInitializedSavedObject({ type: 'dashboard', id: originalId }).then(
           savedObject => {
-            sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-              return Bluebird.reject('simulated error');
-            });
+            stubSavedObjectsClientCreate('simulated error', false);
             savedObject.copyOnSave = true;
+
             return savedObject
-              .save()
+              .save(saveOptionsMock)
               .then(() => {
-                throw new Error('Expected a rejection');
+                expect(false).toBe(true);
               })
               .catch(() => {
-                expect(savedObject.id).to.be(originalId);
+                expect(savedObject.id).toBe(originalId);
               });
           }
         );
       });
 
-      it('as false does not create a copy', function() {
-        const id = 'myId';
-        const mockDocResponse = getMockedDocResponse(id);
-        stubESResponse(mockDocResponse);
+      it('as false does not create a copy', () => {
+        const myId = 'myId';
+        stubESResponse(getMockedDocResponse(myId));
 
-        return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
-          sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-            expect(savedObject.id).to.be(id);
-            return Bluebird.resolve(id);
+        return createInitializedSavedObject({ type: 'dashboard', id: myId }).then(savedObject => {
+          savedObjectsClientStub.create = jest.fn().mockImplementation(() => {
+            expect(savedObject.id).toBe(myId);
+            return Bluebird.resolve({ id: myId });
           });
           savedObject.copyOnSave = false;
-          return savedObject.save().then(id => {
-            expect(id).to.be(id);
+
+          return savedObject.save(saveOptionsMock).then(id => {
+            expect(id).toBe(myId);
           });
         });
       });
     });
 
-    it('returns id from server on success', function() {
+    it('returns id from server on success', () => {
       return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
-        const mockDocResponse = getMockedDocResponse('myId');
-        sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-          return Bluebird.resolve({
-            type: 'dashboard',
-            id: 'myId',
-            _version: 'foo',
-          });
-        });
+        stubESResponse(getMockedDocResponse('myId'));
+        stubSavedObjectsClientCreate({
+          type: 'dashboard',
+          id: 'myId',
+          _version: 'foo',
+        } as SimpleSavedObject<SavedObjectAttributes>);
 
-        stubESResponse(mockDocResponse);
-        return savedObject.save().then(id => {
-          expect(id).to.be('myId');
+        return savedObject.save(saveOptionsMock).then(id => {
+          expect(id).toBe('myId');
         });
       });
     });
 
-    describe('updates isSaving variable', function() {
-      it('on success', function() {
+    describe('updates isSaving variable', () => {
+      it('on success', () => {
         const id = 'id';
         stubESResponse(getMockedDocResponse(id));
 
-        return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
-          sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-            expect(savedObject.isSaving).to.be(true);
+        return createInitializedSavedObject({ type: 'dashboard', id }).then(savedObject => {
+          savedObjectsClientStub.create = jest.fn().mockImplementation(() => {
+            expect(savedObject.isSaving).toBe(true);
             return Bluebird.resolve({
               type: 'dashboard',
               id,
-              version: 'foo',
+              _version: 'foo',
             });
           });
-          expect(savedObject.isSaving).to.be(false);
-          return savedObject.save().then(() => {
-            expect(savedObject.isSaving).to.be(false);
+
+          expect(savedObject.isSaving).toBe(false);
+          return savedObject.save(saveOptionsMock).then(() => {
+            expect(savedObject.isSaving).toBe(false);
           });
         });
       });
 
-      it('on failure', function() {
+      it('on failure', () => {
         stubESResponse(getMockedDocResponse('id'));
         return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
-          sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-            expect(savedObject.isSaving).to.be(true);
-            return Bluebird.reject();
+          savedObjectsClientStub.create = jest.fn().mockImplementation(() => {
+            expect(savedObject.isSaving).toBe(true);
+            return Bluebird.reject('');
           });
-          expect(savedObject.isSaving).to.be(false);
-          return savedObject.save().catch(() => {
-            expect(savedObject.isSaving).to.be(false);
+
+          expect(savedObject.isSaving).toBe(false);
+          return savedObject.save(saveOptionsMock).catch(() => {
+            expect(savedObject.isSaving).toBe(false);
           });
         });
       });
@@ -250,7 +237,10 @@ describe('Saved Object', function() {
       it('when "extractReferences" function when passed in', async () => {
         const id = '123';
         stubESResponse(getMockedDocResponse(id));
-        const extractReferences = ({ attributes, references }) => {
+        const extractReferences: SavedObjectConfig['extractReferences'] = ({
+          attributes,
+          references,
+        }) => {
           references.push({
             name: 'test',
             type: 'index-pattern',
@@ -260,17 +250,16 @@ describe('Saved Object', function() {
         };
         return createInitializedSavedObject({ type: 'dashboard', extractReferences }).then(
           savedObject => {
-            sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-              return Bluebird.resolve({
-                id,
-                version: 'foo',
-                type: 'dashboard',
-              });
-            });
-            return savedObject.save().then(() => {
-              const { references } = savedObjectsClientStub.create.getCall(0).args[2];
-              expect(references).to.have.length(1);
-              expect(references[0]).to.eql({
+            stubSavedObjectsClientCreate({
+              id,
+              _version: 'foo',
+              type: 'dashboard',
+            } as SimpleSavedObject<SavedObjectAttributes>);
+
+            return savedObject.save(saveOptionsMock).then(() => {
+              const { references } = (savedObjectsClientStub.create as jest.Mock).mock.calls[0][2];
+              expect(references).toHaveLength(1);
+              expect(references[0]).toEqual({
                 name: 'test',
                 type: 'index-pattern',
                 id: 'my-index',
@@ -285,33 +274,33 @@ describe('Saved Object', function() {
         stubESResponse(getMockedDocResponse(id));
         return createInitializedSavedObject({ type: 'dashboard', searchSource: true }).then(
           savedObject => {
-            sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-              return Bluebird.resolve({
-                id,
-                version: 2,
-                type: 'dashboard',
-              });
-            });
+            stubSavedObjectsClientCreate({
+              id,
+              _version: '2',
+              type: 'dashboard',
+            } as SimpleSavedObject<SavedObjectAttributes>);
+
             const indexPattern = new StubIndexPattern(
               'my-index',
               getConfig,
               null,
               [],
-              npSetup.core
+              coreMock.createSetup()
             );
             indexPattern.title = indexPattern.id;
-            savedObject.searchSource.setField('index', indexPattern);
-            return savedObject.save().then(() => {
-              expect(savedObjectsClientStub.create.getCall(0).args[1]).to.eql({
+            savedObject.searchSource!.setField('index', indexPattern);
+            return savedObject.save(saveOptionsMock).then(() => {
+              const args = (savedObjectsClientStub.create as jest.Mock).mock.calls[0];
+              expect(args[1]).toEqual({
                 kibanaSavedObjectMeta: {
                   searchSourceJSON: JSON.stringify({
                     indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.index',
                   }),
                 },
               });
-              const { references } = savedObjectsClientStub.create.getCall(0).args[2];
-              expect(references).to.have.length(1);
-              expect(references[0]).to.eql({
+
+              expect(args[2].references).toHaveLength(1);
+              expect(args[2].references[0]).toEqual({
                 name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
                 type: 'index-pattern',
                 id: 'my-index',
@@ -326,25 +315,31 @@ describe('Saved Object', function() {
         stubESResponse(getMockedDocResponse(id));
         return createInitializedSavedObject({ type: 'dashboard', searchSource: true }).then(
           savedObject => {
-            sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-              return Bluebird.resolve({
-                id,
-                version: 2,
-                type: 'dashboard',
-              });
-            });
-            savedObject.searchSource.setFields({ index: 'non-existant-index' });
-            return savedObject.save().then(() => {
-              expect(savedObjectsClientStub.create.getCall(0).args[1]).to.eql({
+            stubSavedObjectsClientCreate({
+              id,
+              _version: '2',
+              type: 'dashboard',
+            } as SimpleSavedObject<SavedObjectAttributes>);
+
+            const indexPattern = new StubIndexPattern(
+              'non-existant-index',
+              getConfig,
+              null,
+              [],
+              coreMock.createSetup()
+            );
+            savedObject.searchSource!.setFields({ index: indexPattern });
+            return savedObject.save(saveOptionsMock).then(() => {
+              const args = (savedObjectsClientStub.create as jest.Mock).mock.calls[0];
+              expect(args[1]).toEqual({
                 kibanaSavedObjectMeta: {
                   searchSourceJSON: JSON.stringify({
                     indexRefName: 'kibanaSavedObjectMeta.searchSourceJSON.index',
                   }),
                 },
               });
-              const { references } = savedObjectsClientStub.create.getCall(0).args[2];
-              expect(references).to.have.length(1);
-              expect(references[0]).to.eql({
+              expect(args[2].references).toHaveLength(1);
+              expect(args[2].references[0]).toEqual({
                 name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
                 type: 'index-pattern',
                 id: 'non-existant-index',
@@ -359,22 +354,22 @@ describe('Saved Object', function() {
         stubESResponse(getMockedDocResponse(id));
         return createInitializedSavedObject({ type: 'dashboard', searchSource: true }).then(
           savedObject => {
-            sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
-              return Bluebird.resolve({
-                id,
-                version: 2,
-                type: 'dashboard',
-              });
-            });
-            savedObject.searchSource.setField('filter', [
+            stubSavedObjectsClientCreate({
+              id,
+              _version: '2',
+              type: 'dashboard',
+            } as SimpleSavedObject<SavedObjectAttributes>);
+
+            savedObject.searchSource!.setField('filter', [
               {
                 meta: {
                   index: 'my-index',
                 },
               },
-            ]);
-            return savedObject.save().then(() => {
-              expect(savedObjectsClientStub.create.getCall(0).args[1]).to.eql({
+            ] as any);
+            return savedObject.save(saveOptionsMock).then(() => {
+              const args = (savedObjectsClientStub.create as jest.Mock).mock.calls[0];
+              expect(args[1]).toEqual({
                 kibanaSavedObjectMeta: {
                   searchSourceJSON: JSON.stringify({
                     filter: [
@@ -388,9 +383,8 @@ describe('Saved Object', function() {
                   }),
                 },
               });
-              const { references } = savedObjectsClientStub.create.getCall(0).args[2];
-              expect(references).to.have.length(1);
-              expect(references[0]).to.eql({
+              expect(args[2].references).toHaveLength(1);
+              expect(args[2].references[0]).toEqual({
                 name: 'kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index',
                 type: 'index-pattern',
                 id: 'my-index',
@@ -402,20 +396,20 @@ describe('Saved Object', function() {
     });
   });
 
-  describe('applyESResp', function() {
-    it('throws error if not found', function() {
+  describe('applyESResp', () => {
+    it('throws error if not found', () => {
       return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
-        const response = {};
+        const response = { _source: {} };
         try {
           savedObject.applyESResp(response);
-          expect(true).to.be(false);
+          expect(true).toBe(false);
         } catch (err) {
-          expect(!!err).to.be(true);
+          expect(!!err).toBe(true);
         }
       });
     });
 
-    it('throws error invalid JSON is detected', async function() {
+    it('throws error invalid JSON is detected', async () => {
       const savedObject = await createInitializedSavedObject({
         type: 'dashboard',
         searchSource: true,
@@ -433,11 +427,11 @@ describe('Saved Object', function() {
         await savedObject.applyESResp(response);
         throw new Error('applyESResp should have failed, but did not.');
       } catch (err) {
-        expect(err instanceof InvalidJSONProperty).to.be(true);
+        expect(err instanceof InvalidJSONProperty).toBe(true);
       }
     });
 
-    it('preserves original defaults if not overridden', function() {
+    it('preserves original defaults if not overridden', () => {
       const id = 'anid';
       const preserveMeValue = 'here to stay!';
       const config = {
@@ -445,43 +439,40 @@ describe('Saved Object', function() {
           preserveMe: preserveMeValue,
         },
         type: 'dashboard',
-        id: id,
+        id,
       };
 
       const mockDocResponse = getMockedDocResponse(id);
       stubESResponse(mockDocResponse);
 
-      const savedObject = new SavedObject(config);
-      return savedObject
-        .init()
+      const savedObject = new SavedObjectClass(config);
+      return savedObject.init!()
         .then(() => {
-          expect(savedObject._source.preserveMe).to.equal(preserveMeValue);
+          expect(savedObject._source.preserveMe).toEqual(preserveMeValue);
           const response = { found: true, _source: {} };
           return savedObject.applyESResp(response);
         })
         .then(() => {
-          expect(savedObject._source.preserveMe).to.equal(preserveMeValue);
+          expect(savedObject._source.preserveMe).toEqual(preserveMeValue);
         });
     });
 
-    it('overrides defaults', function() {
+    it('overrides defaults', () => {
       const id = 'anid';
       const config = {
         defaults: {
           flower: 'rose',
         },
         type: 'dashboard',
-        id: id,
+        id,
       };
 
-      const mockDocResponse = getMockedDocResponse(id);
-      stubESResponse(mockDocResponse);
+      stubESResponse(getMockedDocResponse(id));
 
-      const savedObject = new SavedObject(config);
-      return savedObject
-        .init()
+      const savedObject = new SavedObjectClass(config);
+      return savedObject.init!()
         .then(() => {
-          expect(savedObject._source.flower).to.equal('rose');
+          expect(savedObject._source.flower).toEqual('rose');
           const response = {
             found: true,
             _source: {
@@ -491,11 +482,11 @@ describe('Saved Object', function() {
           return savedObject.applyESResp(response);
         })
         .then(() => {
-          expect(savedObject._source.flower).to.equal('orchid');
+          expect(savedObject._source.flower).toEqual('orchid');
         });
     });
 
-    it('overrides previous _source and default values', function() {
+    it('overrides previous _source and default values', () => {
       const id = 'anid';
       const config = {
         defaults: {
@@ -504,7 +495,7 @@ describe('Saved Object', function() {
           },
         },
         type: 'dashboard',
-        id: id,
+        id,
       };
 
       const mockDocResponse = getMockedDocResponse(id, {
@@ -512,9 +503,8 @@ describe('Saved Object', function() {
       });
       stubESResponse(mockDocResponse);
 
-      const savedObject = new SavedObject(config);
-      return savedObject
-        .init()
+      const savedObject = new SavedObjectClass(config);
+      return savedObject.init!()
         .then(() => {
           const response = {
             found: true,
@@ -524,19 +514,18 @@ describe('Saved Object', function() {
           return savedObject.applyESResp(response);
         })
         .then(() => {
-          expect(savedObject._source.dinosaurs.tRex).to.equal('has big teeth');
+          expect((savedObject._source as any).dinosaurs.tRex).toEqual('has big teeth');
         });
     });
 
     it('does not inject references when references array is missing', async () => {
-      const injectReferences = sinon.stub();
+      const injectReferences = jest.fn();
       const config = {
         type: 'dashboard',
         injectReferences,
       };
-      const savedObject = new SavedObject(config);
-      return savedObject
-        .init()
+      const savedObject = new SavedObjectClass(config);
+      return savedObject.init!()
         .then(() => {
           const response = {
             found: true,
@@ -547,19 +536,18 @@ describe('Saved Object', function() {
           return savedObject.applyESResp(response);
         })
         .then(() => {
-          expect(injectReferences).to.have.property('notCalled', true);
+          expect(injectReferences).not.toHaveBeenCalled();
         });
     });
 
     it('does not inject references when references array is empty', async () => {
-      const injectReferences = sinon.stub();
+      const injectReferences = jest.fn();
       const config = {
         type: 'dashboard',
         injectReferences,
       };
-      const savedObject = new SavedObject(config);
-      return savedObject
-        .init()
+      const savedObject = new SavedObjectClass(config);
+      return savedObject.init!()
         .then(() => {
           const response = {
             found: true,
@@ -571,19 +559,18 @@ describe('Saved Object', function() {
           return savedObject.applyESResp(response);
         })
         .then(() => {
-          expect(injectReferences).to.have.property('notCalled', true);
+          expect(injectReferences).not.toHaveBeenCalled();
         });
     });
 
     it('injects references when function is provided and references exist', async () => {
-      const injectReferences = sinon.stub();
+      const injectReferences = jest.fn();
       const config = {
         type: 'dashboard',
         injectReferences,
       };
-      const savedObject = new SavedObject(config);
-      return savedObject
-        .init()
+      const savedObject = new SavedObjectClass(config);
+      return savedObject.init!()
         .then(() => {
           const response = {
             found: true,
@@ -595,13 +582,13 @@ describe('Saved Object', function() {
           return savedObject.applyESResp(response);
         })
         .then(() => {
-          expect(injectReferences).to.have.property('calledOnce', true);
+          expect(injectReferences).toHaveBeenCalledTimes(1);
         });
     });
 
     it('injects references from searchSourceJSON', async () => {
-      const savedObject = new SavedObject({ type: 'dashboard', searchSource: true });
-      return savedObject.init().then(() => {
+      const savedObject = new SavedObjectClass({ type: 'dashboard', searchSource: true });
+      return savedObject.init!().then(() => {
         const response = {
           found: true,
           _source: {
@@ -632,7 +619,7 @@ describe('Saved Object', function() {
           ],
         };
         savedObject.applyESResp(response);
-        expect(savedObject.searchSource.getFields()).to.eql({
+        expect(savedObject.searchSource!.getFields()).toEqual({
           index: 'my-index-1',
           filter: [
             {
@@ -646,119 +633,115 @@ describe('Saved Object', function() {
     });
   });
 
-  describe('config', function() {
-    it('afterESResp is called', function() {
-      const afterESRespCallback = sinon.spy();
+  describe('config', () => {
+    it('afterESResp is called', () => {
+      const afterESRespCallback = jest.fn();
       const config = {
         type: 'dashboard',
         afterESResp: afterESRespCallback,
       };
 
       return createInitializedSavedObject(config).then(() => {
-        expect(afterESRespCallback.called).to.be(true);
+        expect(afterESRespCallback).toHaveBeenCalled();
       });
     });
 
-    describe('searchSource', function() {
-      it('when true, creates index', function() {
+    describe('searchSource', () => {
+      it('when true, creates index', () => {
         const indexPatternId = 'testIndexPattern';
-        const afterESRespCallback = sinon.spy();
+        const afterESRespCallback = jest.fn();
 
-        const config = {
+        const config: SavedObjectConfig = {
           type: 'dashboard',
           afterESResp: afterESRespCallback,
           searchSource: true,
-          indexPattern: indexPatternId,
+          indexPattern: { id: indexPatternId } as IIndexPattern,
         };
 
-        stubESResponse({
-          id: indexPatternId,
-          type: 'dashboard',
-          attributes: {
-            title: 'testIndexPattern',
-          },
-          _version: 'foo',
-        });
+        stubESResponse(
+          getMockedDocResponse(indexPatternId, {
+            attributes: {
+              title: 'testIndexPattern',
+            },
+          })
+        );
 
-        const savedObject = new SavedObject(config);
-        sinon.stub(savedObject, 'hydrateIndexPattern').callsFake(() => {
+        const savedObject = new SavedObjectClass(config);
+        savedObject.hydrateIndexPattern = jest.fn().mockImplementation(() => {
           const indexPattern = new StubIndexPattern(
             indexPatternId,
             getConfig,
             null,
             [],
-            npSetup.core
+            coreMock.createSetup()
           );
           indexPattern.title = indexPattern.id;
-          savedObject.searchSource.setField('index', indexPattern);
-          return Promise.resolve(indexPattern);
+          savedObject.searchSource!.setField('index', indexPattern);
+          return Bluebird.resolve(indexPattern);
         });
-        expect(!!savedObject.searchSource.getField('index')).to.be(false);
+        expect(!!savedObject.searchSource!.getField('index')).toBe(false);
 
-        return savedObject.init().then(() => {
-          expect(afterESRespCallback.called).to.be(true);
-          const index = savedObject.searchSource.getField('index');
-          expect(index instanceof StubIndexPattern).to.be(true);
-          expect(index.id).to.equal(indexPatternId);
+        return savedObject.init!().then(() => {
+          expect(afterESRespCallback).toHaveBeenCalled();
+          const index = savedObject.searchSource!.getField('index');
+          expect(index instanceof StubIndexPattern).toBe(true);
+          expect(index!.id).toEqual(indexPatternId);
         });
       });
 
-      it('when false, does not create index', function() {
+      it('when false, does not create index', () => {
         const indexPatternId = 'testIndexPattern';
-        const afterESRespCallback = sinon.spy();
+        const afterESRespCallback = jest.fn();
 
-        const config = {
+        const config: SavedObjectConfig = {
           type: 'dashboard',
           afterESResp: afterESRespCallback,
           searchSource: false,
-          indexPattern: indexPatternId,
+          indexPattern: { id: indexPatternId } as IIndexPattern,
         };
 
         stubESResponse(getMockedDocResponse(indexPatternId));
 
-        const savedObject = new SavedObject(config);
-        expect(!!savedObject.searchSource).to.be(false);
+        const savedObject = new SavedObjectClass(config);
+        expect(!!savedObject.searchSource).toBe(false);
 
-        return savedObject.init().then(() => {
-          expect(afterESRespCallback.called).to.be(true);
-          expect(!!savedObject.searchSource).to.be(false);
+        return savedObject.init!().then(() => {
+          expect(afterESRespCallback).toHaveBeenCalled();
+          expect(!!savedObject.searchSource).toBe(false);
         });
       });
     });
 
-    describe('type', function() {
-      it('that is not specified throws an error', function() {
+    describe('type', () => {
+      it('that is not specified throws an error', done => {
         const config = {};
 
-        const savedObject = new SavedObject(config);
-        try {
-          savedObject.init();
-          expect(false).to.be(true);
-        } catch (err) {
-          expect(err).to.not.be(null);
-        }
+        const savedObject = new SavedObjectClass(config);
+        savedObject.init!().catch(() => {
+          done();
+        });
       });
 
-      it('that is invalid invalid throws an error', function() {
+      it('that is invalid invalid throws an error', () => {
         const config = { type: 'notypeexists' };
 
-        const savedObject = new SavedObject(config);
+        const savedObject = new SavedObjectClass(config);
         try {
-          savedObject.init();
-          expect(false).to.be(true);
+          savedObject.init!();
+          expect(false).toBe(true);
         } catch (err) {
-          expect(err).to.not.be(null);
+          expect(err).not.toBeNull();
         }
       });
 
-      it('that is valid passes', function() {
+      it('that is valid passes', () => {
         const config = { type: 'dashboard' };
-        return new SavedObject(config).init();
+        return new SavedObjectClass(config).init!();
       });
     });
 
-    describe('defaults', function() {
-      function getTestDefaultConfig(extraOptions) {
+    describe('defaults', () => {
+      function getTestDefaultConfig(extraOptions: object = {}) {
         return {
           defaults: { testDefault: 'hi' },
           type: 'dashboard',
@@ -766,31 +749,31 @@ describe('Saved Object', function() {
         };
       }
 
-      function expectDefaultApplied(config) {
+      function expectDefaultApplied(config: SavedObjectConfig) {
         return createInitializedSavedObject(config).then(savedObject => {
-          expect(savedObject.defaults).to.be(config.defaults);
+          expect(savedObject.defaults).toBe(config.defaults);
         });
       }
 
-      describe('applied to object when id', function() {
-        it('is not specified', function() {
+      describe('applied to object when id', () => {
+        it('is not specified', () => {
           expectDefaultApplied(getTestDefaultConfig());
         });
 
-        it('is undefined', function() {
+        it('is undefined', () => {
           expectDefaultApplied(getTestDefaultConfig({ id: undefined }));
         });
 
-        it('is 0', function() {
+        it('is 0', () => {
           expectDefaultApplied(getTestDefaultConfig({ id: 0 }));
         });
 
-        it('is false', function() {
+        it('is false', () => {
           expectDefaultApplied(getTestDefaultConfig({ id: false }));
         });
       });
 
-      it('applied to source if an id is given', function() {
+      it('applied to source if an id is given', () => {
         const myId = 'myid';
         const customDefault = 'hi';
         const initialOverwriteMeValue = 'this should get overwritten by the server response';
@@ -798,7 +781,7 @@ describe('Saved Object', function() {
         const config = {
           defaults: {
             overwriteMe: initialOverwriteMeValue,
-            customDefault: customDefault,
+            customDefault,
           },
           type: 'dashboard',
           id: myId,
@@ -813,10 +796,10 @@ describe('Saved Object', function() {
         stubESResponse(mockDocResponse);
 
         return createInitializedSavedObject(config).then(savedObject => {
-          expect(!!savedObject._source).to.be(true);
-          expect(savedObject.defaults).to.be(config.defaults);
-          expect(savedObject._source.overwriteMe).to.be(serverValue);
-          expect(savedObject._source.customDefault).to.be(customDefault);
+          expect(!!savedObject._source).toBe(true);
+          expect(savedObject.defaults).toBe(config.defaults);
+          expect(savedObject._source.overwriteMe).toBe(serverValue);
+          expect(savedObject._source.customDefault).toBe(customDefault);
         });
       });
     });
diff --git a/src/legacy/ui/public/saved_objects/saved_object.ts b/src/plugins/saved_objects/public/saved_object/saved_object.ts
similarity index 98%
rename from src/legacy/ui/public/saved_objects/saved_object.ts
rename to src/plugins/saved_objects/public/saved_object/saved_object.ts
index ca0746410a7dd..45711cb6b3498 100644
--- a/src/legacy/ui/public/saved_objects/saved_object.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object.ts
@@ -27,7 +27,7 @@
  * This class seems to interface with ES primarily through the es Angular
  * service and the saved object api.
  */
-import { SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from './types';
+import { SavedObject, SavedObjectConfig, SavedObjectKibanaServices } from '../types';
 import { buildSavedObject } from './helpers/build_saved_object';
 
 export function createSavedObjectClass(services: SavedObjectKibanaServices) {
diff --git a/src/legacy/ui/public/saved_objects/saved_object_loader.ts b/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
similarity index 98%
rename from src/legacy/ui/public/saved_objects/saved_object_loader.ts
rename to src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
index 7784edc9ad528..36a169d20e51c 100644
--- a/src/legacy/ui/public/saved_objects/saved_object_loader.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SavedObject } from 'ui/saved_objects/types';
 import { ChromeStart, SavedObjectsClientContract, SavedObjectsFindOptions } from 'kibana/public';
+import { SavedObject } from '../types';
 import { StringUtils } from './helpers/string_utils';
 
 /**
diff --git a/src/legacy/ui/public/saved_objects/types.ts b/src/plugins/saved_objects/public/types.ts
similarity index 96%
rename from src/legacy/ui/public/saved_objects/types.ts
rename to src/plugins/saved_objects/public/types.ts
index e44c323aebb87..99088df84ec36 100644
--- a/src/legacy/ui/public/saved_objects/types.ts
+++ b/src/plugins/saved_objects/public/types.ts
@@ -24,11 +24,7 @@ import {
   SavedObjectAttributes,
   SavedObjectReference,
 } from 'kibana/public';
-import {
-  IIndexPattern,
-  IndexPatternsContract,
-  ISearchSource,
-} from '../../../../plugins/data/public';
+import { IIndexPattern, IndexPatternsContract, ISearchSource } from '../../data/public';
 
 export interface SavedObject {
   _serialize: () => { attributes: SavedObjectAttributes; references: SavedObjectReference[] };
diff --git a/x-pack/legacy/plugins/graph/public/legacy_imports.ts b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
index 27184f5701235..ac518d34551db 100644
--- a/x-pack/legacy/plugins/graph/public/legacy_imports.ts
+++ b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
@@ -6,10 +6,8 @@
 
 import 'ace';
 
-export { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
 // @ts-ignore
 export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
 // @ts-ignore
 export { addAppRedirectMessageToUrl } from 'ui/notify';
-export { createSavedObjectClass } from 'ui/saved_objects/saved_object';
 export { configureAppAngularModule } from '../../../../../src/plugins/kibana_legacy/public';
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
index d25fcc89d6a1f..025d5e6935902 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
@@ -6,10 +6,10 @@
 import { i18n } from '@kbn/i18n';
 import { extractReferences, injectReferences } from './saved_workspace_references';
 import {
-  createSavedObjectClass,
   SavedObject,
+  createSavedObjectClass,
   SavedObjectKibanaServices,
-} from '../../legacy_imports';
+} from '../../../../../../../src/plugins/saved_objects/public';
 
 export interface SavedWorkspace extends SavedObject {
   wsState?: string;
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
index 8ddff0be0d06d..184fbc01eb96f 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
@@ -7,8 +7,8 @@
 import { IBasePath } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 
+import { SavedObjectKibanaServices } from '../../../../../../../src/plugins/saved_objects/public';
 import { createSavedWorkspaceClass } from './saved_workspace';
-import { SavedObjectKibanaServices } from '../../legacy_imports';
 
 export function createSavedWorkspacesLoader(
   services: SavedObjectKibanaServices & { basePath: IBasePath }
diff --git a/x-pack/legacy/plugins/graph/public/types/persistence.ts b/x-pack/legacy/plugins/graph/public/types/persistence.ts
index adb07605b61c4..cdaee5db202d8 100644
--- a/x-pack/legacy/plugins/graph/public/types/persistence.ts
+++ b/x-pack/legacy/plugins/graph/public/types/persistence.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { SavedObject } from '../../../../../../src/plugins/saved_objects/public';
 import { AdvancedSettings, UrlTemplate, WorkspaceField } from './app_state';
 import { WorkspaceNode, WorkspaceEdge } from './workspace_state';
-import { SavedObject } from '../legacy_imports';
 
 type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
diff --git a/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js b/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js
index bd496f44aa8ac..252d602e8f564 100644
--- a/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js
+++ b/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js
@@ -6,7 +6,7 @@
 
 import { createSavedGisMapClass } from './saved_gis_map';
 import { uiModules } from 'ui/modules';
-import { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectLoader } from '../../../../../../../src/plugins/saved_objects/public';
 import { npStart } from '../../../../../../../src/legacy/ui/public/new_platform';
 
 const module = uiModules.get('app/maps');
diff --git a/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js b/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
index 035ae4886920c..490ab16a1799c 100644
--- a/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
+++ b/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
@@ -5,7 +5,7 @@
  */
 
 import _ from 'lodash';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import { createSavedObjectClass } from '../../../../../../../src/plugins/saved_objects/public';
 import {
   getTimeFilters,
   getMapZoom,
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b171863f26c21..e08de8de203ca 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -250,13 +250,6 @@
     "common.ui.flotCharts.wedLabel": "水",
     "common.ui.paginateControls.pageSizeLabel": "ページサイズ",
     "common.ui.paginateControls.scrollTopButtonLabel": "最上部に移動",
-    "common.ui.savedObjects.confirmModal.overwriteButtonLabel": "上書き",
-    "common.ui.savedObjects.confirmModal.overwriteConfirmationMessage": "{title} を上書きしてよろしいですか？",
-    "common.ui.savedObjects.confirmModal.overwriteTitle": "{name} を上書きしますか？",
-    "common.ui.savedObjects.confirmModal.saveDuplicateButtonLabel": "{name} を保存",
-    "common.ui.savedObjects.confirmModal.saveDuplicateConfirmationMessage": "「{title}」というタイトルの {name} が既に存在します。保存を続けますか？",
-    "common.ui.savedObjects.overwriteRejectedDescription": "上書き確認が拒否されました",
-    "common.ui.savedObjects.saveDuplicateRejectedDescription": "重複ファイルの保存確認が拒否されました",
     "common.ui.scriptingLanguages.errorFetchingToastDescription": "Elasticsearch から利用可能なスクリプト言語の取得中にエラーが発生しました",
     "common.ui.stateManagement.unableToParseUrlErrorMessage": "URL をパースできません",
     "common.ui.stateManagement.unableToRestoreUrlErrorMessage": "URL を完全に復元できません。共有機能を使用していることを確認してください。",
@@ -2440,12 +2433,19 @@
     "regionMap.visParams.vectorMapLabel": "ベクトルマップ",
     "regionMap.visualization.unableToShowMismatchesWarningText": "次の各用語がシェイプの結合フィールドのシェイプと一致することを確認してください: {mismatches}",
     "regionMap.visualization.unableToShowMismatchesWarningTitle": "{mismatchesLength} {oneMismatch, plural, one { 件の結果} other { 件の結果}}をマップに表示できません",
+    "savedObjects.confirmModal.overwriteButtonLabel": "上書き",
+    "savedObjects.confirmModal.overwriteConfirmationMessage": "{title} を上書きしてよろしいですか？",
+    "savedObjects.confirmModal.overwriteTitle": "{name} を上書きしますか？",
+    "savedObjects.confirmModal.saveDuplicateButtonLabel": "{name} を保存",
+    "savedObjects.confirmModal.saveDuplicateConfirmationMessage": "「{title}」というタイトルの {name} が既に存在します。保存を続けますか？",
     "savedObjects.finder.filterButtonLabel": "タイプ",
     "savedObjects.finder.searchPlaceholder": "検索...",
     "savedObjects.finder.sortAsc": "昇順",
     "savedObjects.finder.sortAuto": "ベストマッチ",
     "savedObjects.finder.sortButtonLabel": "並べ替え",
     "savedObjects.finder.sortDesc": "降順",
+    "savedObjects.overwriteRejectedDescription": "上書き確認が拒否されました",
+    "savedObjects.saveDuplicateRejectedDescription": "重複ファイルの保存確認が拒否されました",
     "savedObjects.saveModal.cancelButtonLabel": "キャンセル",
     "savedObjects.saveModal.descriptionLabel": "説明",
     "savedObjects.saveModal.duplicateTitleDescription": "{confirmSaveLabel} をクリックすると、既存の {objectType} が上書きされます。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 050e9bd40f58d..58c79e0bc0ca2 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -250,13 +250,6 @@
     "common.ui.flotCharts.wedLabel": "周三",
     "common.ui.paginateControls.pageSizeLabel": "页面大小",
     "common.ui.paginateControls.scrollTopButtonLabel": "滚动至顶部",
-    "common.ui.savedObjects.confirmModal.overwriteButtonLabel": "覆盖",
-    "common.ui.savedObjects.confirmModal.overwriteConfirmationMessage": "确定要覆盖 “{title}”？",
-    "common.ui.savedObjects.confirmModal.overwriteTitle": "覆盖“{name}”？",
-    "common.ui.savedObjects.confirmModal.saveDuplicateButtonLabel": "保存“{name}”",
-    "common.ui.savedObjects.confirmModal.saveDuplicateConfirmationMessage": "具有标题 “{title}” 的 “{name}” 已存在。是否确定要保存？",
-    "common.ui.savedObjects.overwriteRejectedDescription": "已拒绝覆盖确认",
-    "common.ui.savedObjects.saveDuplicateRejectedDescription": "已拒绝使用重复标题保存确认",
     "common.ui.scriptingLanguages.errorFetchingToastDescription": "从 Elasticsearch 获取可用的脚本语言时出错",
     "common.ui.stateManagement.unableToParseUrlErrorMessage": "无法解析 URL",
     "common.ui.stateManagement.unableToRestoreUrlErrorMessage": "无法完整还原 URL，确保使用共享功能。",
@@ -2440,12 +2433,19 @@
     "regionMap.visParams.vectorMapLabel": "矢量地图",
     "regionMap.visualization.unableToShowMismatchesWarningText": "确保每个字词与该形状的联接字段匹配：{mismatches}",
     "regionMap.visualization.unableToShowMismatchesWarningTitle": "无法在地图上显示 {mismatchesLength} {oneMismatch, plural, one { 个结果} other { 个结果}}",
+    "savedObjects.confirmModal.overwriteButtonLabel": "覆盖",
+    "savedObjects.confirmModal.overwriteConfirmationMessage": "确定要覆盖 “{title}”？",
+    "savedObjects.confirmModal.overwriteTitle": "覆盖“{name}”？",
+    "savedObjects.confirmModal.saveDuplicateButtonLabel": "保存“{name}”",
+    "savedObjects.confirmModal.saveDuplicateConfirmationMessage": "具有标题 “{title}” 的 “{name}” 已存在。是否确定要保存？",
     "savedObjects.finder.filterButtonLabel": "类型",
     "savedObjects.finder.searchPlaceholder": "搜索……",
     "savedObjects.finder.sortAsc": "升序",
     "savedObjects.finder.sortAuto": "最佳匹配",
     "savedObjects.finder.sortButtonLabel": "排序",
     "savedObjects.finder.sortDesc": "降序",
+    "savedObjects.overwriteRejectedDescription": "已拒绝覆盖确认",
+    "savedObjects.saveDuplicateRejectedDescription": "已拒绝使用重复标题保存确认",
     "savedObjects.saveModal.cancelButtonLabel": "取消",
     "savedObjects.saveModal.descriptionLabel": "描述",
     "savedObjects.saveModal.duplicateTitleDescription": "单击“{confirmSaveLabel}”可覆盖现有 {objectType}。",