diff --git a/src/ui/public/state_management/__tests__/state.js b/src/ui/public/state_management/__tests__/state.js
index 3fb02df49eb92..c9e25b07494ac 100644
--- a/src/ui/public/state_management/__tests__/state.js
+++ b/src/ui/public/state_management/__tests__/state.js
@@ -8,7 +8,7 @@ import 'ui/private';
 import Notifier from 'ui/notify/notifier';
 import StateManagementStateProvider from 'ui/state_management/state';
 import { unhashQueryString } from 'ui/state_management/state_hashing';
-import { HashingStore } from 'ui/state_management/state_storage/hashing_store';
+import { HashingStore } from 'ui/state_management/state_storage';
 import StubBrowserStorage from 'test_utils/stub_browser_storage';
 import EventsProvider from 'ui/events';
 
diff --git a/src/ui/public/state_management/state.js b/src/ui/public/state_management/state.js
index 3f42887c50fed..f06862010c738 100644
--- a/src/ui/public/state_management/state.js
+++ b/src/ui/public/state_management/state.js
@@ -7,8 +7,10 @@ import EventsProvider from 'ui/events';
 import Notifier from 'ui/notify/notifier';
 import KbnUrlProvider from 'ui/url';
 
-import { HashingStore } from './state_storage/hashing_store';
-import { LazyLruStore } from './state_storage/lazy_lru_store';
+import {
+  HashingStore,
+  LazyLruStore,
+} from './state_storage';
 
 const MAX_BROWSER_HISTORY = 50;
 
diff --git a/src/ui/public/state_management/state_storage/_tests__/hashing_store.js b/src/ui/public/state_management/state_storage/_tests__/hashing_store.js
index 89b0fcb7af068..c8d42ac321cd5 100644
--- a/src/ui/public/state_management/state_storage/_tests__/hashing_store.js
+++ b/src/ui/public/state_management/state_storage/_tests__/hashing_store.js
@@ -3,7 +3,7 @@ import sinon from 'sinon';
 import { encode as encodeRison } from 'rison-node';
 
 import StubBrowserStorage from 'test_utils/stub_browser_storage';
-import { HashingStore } from 'ui/state_management/state_storage/hashing_store';
+import { HashingStore } from 'ui/state_management/state_storage';
 
 const setup = ({ createHash } = {}) => {
   const store = new StubBrowserStorage();
diff --git a/src/ui/public/state_management/state_storage/_tests__/lazy_lru_store.js b/src/ui/public/state_management/state_storage/_tests__/lazy_lru_store.js
index 175dfe014db2e..2fa5f5cf335f8 100644
--- a/src/ui/public/state_management/state_storage/_tests__/lazy_lru_store.js
+++ b/src/ui/public/state_management/state_storage/_tests__/lazy_lru_store.js
@@ -3,7 +3,7 @@ import sinon from 'sinon';
 import { times, sum, padLeft } from 'lodash';
 
 import StubBrowserStorage from 'test_utils/stub_browser_storage';
-import { LazyLruStore } from '../lazy_lru_store';
+import { LazyLruStore } from '..';
 
 const setup = (opts = {}) => {
   const {
diff --git a/src/ui/public/state_management/state_storage/hashing_store.js b/src/ui/public/state_management/state_storage/hashing_store.js
index ace62df06d209..b968f29f087ce 100644
--- a/src/ui/public/state_management/state_storage/hashing_store.js
+++ b/src/ui/public/state_management/state_storage/hashing_store.js
@@ -13,7 +13,7 @@ const TAG = 'h@';
  *  hash. This hash is then returned so that the item can be received
  *  at a later time.
  */
-export class HashingStore {
+export default class HashingStore {
   constructor({ store, createHash, maxItems } = {}) {
     this._store = store || window.sessionStorage;
     if (createHash) this._createHash = createHash;
diff --git a/src/ui/public/state_management/state_storage/index.js b/src/ui/public/state_management/state_storage/index.js
new file mode 100644
index 0000000000000..5c80b0f471901
--- /dev/null
+++ b/src/ui/public/state_management/state_storage/index.js
@@ -0,0 +1,7 @@
+export {
+  default as HashingStore,
+} from './hashing_store';
+
+export {
+  default as LazyLruStore,
+} from './lazy_lru_store';
diff --git a/src/ui/public/state_management/state_storage/lazy_lru_store.js b/src/ui/public/state_management/state_storage/lazy_lru_store.js
index d9b00253250ea..14f015287796d 100644
--- a/src/ui/public/state_management/state_storage/lazy_lru_store.js
+++ b/src/ui/public/state_management/state_storage/lazy_lru_store.js
@@ -31,7 +31,7 @@ const DEFAULT_IDEAL_CLEAR_RATIO = 100;
  */
 const DEFAULT_MAX_IDEAL_CLEAR_PERCENT = 0.3;
 
-export class LazyLruStore {
+export default class LazyLruStore {
   constructor(opts = {}) {
     const {
       id,