diff --git a/src/server/saved_objects/client/lib/__tests__/decorate_es_error.js b/src/server/saved_objects/client/lib/__tests__/decorate_es_error.js
index 77687c2f676b3..4a6c09495c331 100644
--- a/src/server/saved_objects/client/lib/__tests__/decorate_es_error.js
+++ b/src/server/saved_objects/client/lib/__tests__/decorate_es_error.js
@@ -9,7 +9,7 @@ import {
   isForbiddenError,
   isNotFoundError,
   isBadRequestError,
-} from '../error_types';
+} from '../errors';
 
 describe('savedObjectsClient/decorateEsError', () => {
   it('always returns the same error it receives', () => {
diff --git a/src/server/saved_objects/client/lib/__tests__/error_types.js b/src/server/saved_objects/client/lib/__tests__/errors.js
similarity index 99%
rename from src/server/saved_objects/client/lib/__tests__/error_types.js
rename to src/server/saved_objects/client/lib/__tests__/errors.js
index a0c0d73813e80..40cbbb15ded31 100644
--- a/src/server/saved_objects/client/lib/__tests__/error_types.js
+++ b/src/server/saved_objects/client/lib/__tests__/errors.js
@@ -15,7 +15,7 @@ import {
   wrapEsUnavailableError,
   isEsUnavailableError,
   wrapGeneralError,
-} from '../error_types';
+} from '../errors';
 
 describe('savedObjectsClient/errorTypes', () => {
   describe('BadRequest error', () => {
diff --git a/src/ui/ui_settings/__tests__/lib/create_objects_client_stub.js b/src/ui/ui_settings/__tests__/lib/create_objects_client_stub.js
index 340b84c40c861..63ff8b5363b64 100644
--- a/src/ui/ui_settings/__tests__/lib/create_objects_client_stub.js
+++ b/src/ui/ui_settings/__tests__/lib/create_objects_client_stub.js
@@ -1,16 +1,14 @@
 import sinon from 'sinon';
 import expect from 'expect.js';
+import { SavedObjectsClient } from '../../../../server/saved_objects/client';
+
+export const savedObjectsClientErrors = SavedObjectsClient.errors;
 
 export function createObjectsClientStub(type, id, esDocSource = {}) {
   const savedObjectsClient = {
     update: sinon.stub().returns(Promise.resolve()),
     get: sinon.stub().returns({ attributes: esDocSource }),
-    errors: {
-      isNotFoundError: sinon.stub().returns(false),
-      isForbiddenError: sinon.stub().returns(false),
-      isEsUnavailableError: sinon.stub().returns(false),
-      isNotAuthorizedError: sinon.stub().returns(false),
-    }
+    errors: savedObjectsClientErrors
   };
 
   savedObjectsClient.assertGetQuery = () => {
diff --git a/src/ui/ui_settings/__tests__/lib/index.js b/src/ui/ui_settings/__tests__/lib/index.js
index 14c9b5af0c610..0ca35ea49fb7d 100644
--- a/src/ui/ui_settings/__tests__/lib/index.js
+++ b/src/ui/ui_settings/__tests__/lib/index.js
@@ -1 +1,4 @@
-export { createObjectsClientStub } from './create_objects_client_stub';
+export {
+  createObjectsClientStub,
+  savedObjectsClientErrors,
+} from './create_objects_client_stub';
diff --git a/src/ui/ui_settings/__tests__/ui_settings_service.js b/src/ui/ui_settings/__tests__/ui_settings_service.js
index aad976cb98d81..c7ab164c5945e 100644
--- a/src/ui/ui_settings/__tests__/ui_settings_service.js
+++ b/src/ui/ui_settings/__tests__/ui_settings_service.js
@@ -5,7 +5,10 @@ import Chance from 'chance';
 
 import { UiSettingsService } from '../ui_settings_service';
 
-import { createObjectsClientStub } from './lib';
+import {
+  createObjectsClientStub,
+  savedObjectsClientErrors,
+} from './lib';
 
 const TYPE = 'config';
 const ID = 'kibana-version';
@@ -197,9 +200,12 @@ describe('ui settings', () => {
 
     it('throws 401 errors', async () => {
       const { uiSettings } = setup({
-        savedObjectsClient: { async get() {
-          throw new esErrors[401]();
-        } }
+        savedObjectsClient: {
+          errors: savedObjectsClientErrors,
+          async get() {
+            throw new esErrors[401]();
+          }
+        }
       });
 
       try {
@@ -214,9 +220,12 @@ describe('ui settings', () => {
       const expectedUnexpectedError = new Error('unexpected');
 
       const { uiSettings } = setup({
-        savedObjectsClient: { async get() {
-          throw expectedUnexpectedError;
-        } }
+        savedObjectsClient: {
+          errors: savedObjectsClientErrors,
+          async get() {
+            throw expectedUnexpectedError;
+          }
+        }
       });
 
       try {