diff --git a/client/app/scripts/utils/storage-utils.js b/client/app/scripts/utils/storage-utils.js
index d1f3bccb5..61908660b 100644
--- a/client/app/scripts/utils/storage-utils.js
+++ b/client/app/scripts/utils/storage-utils.js
@@ -10,6 +10,10 @@ export const localSessionStorage = {
     window.sessionStorage.setItem(k, v);
     window.localStorage.setItem(k, v);
   },
+  clear() {
+    window.sessionStorage.clear();
+    window.localStorage.clear();
+  }
 };
 
 export function storageGet(key, defaultValue, storage = localSessionStorage) {
diff --git a/client/package.json b/client/package.json
index adcdf6a52..354de17e9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -118,7 +118,7 @@
     },
     "setupFiles": [
       "<rootDir>/test/support/raf.js",
-      "<rootDir>/test/support/localStorage.js"
+      "<rootDir>/test/support/storage.js"
     ],
     "roots": [
       "<rootDir>/app/scripts"
diff --git a/client/test/support/localStorage.js b/client/test/support/localStorage.js
deleted file mode 100644
index 50cf4b680..000000000
--- a/client/test/support/localStorage.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const localStorageMock = (function() {
-  let store = {};
-  return {
-    store,
-    getItem: function(key) {
-      return store[key];
-    },
-    setItem: function(key, value) {
-      store[key] = value;
-    },
-    clear: function() {
-      store = {};
-    }
-  };
-})();
-Object.defineProperty(window, 'Storage', { value: localStorageMock });
-Object.defineProperty(window, 'localStorage', { value: localStorageMock });
diff --git a/client/test/support/storage.js b/client/test/support/storage.js
new file mode 100644
index 000000000..47af5aeab
--- /dev/null
+++ b/client/test/support/storage.js
@@ -0,0 +1,21 @@
+const makeStorageMock = function () {
+  let store = {};
+  return {
+    store,
+    getItem(key) {
+      return store[key];
+    },
+    setItem(key, value) {
+      store[key] = value;
+    },
+    clear() {
+      store = {};
+    }
+  };
+};
+
+const localStorageMock = makeStorageMock();
+const sessionStorageMock = makeStorageMock();
+
+Object.defineProperty(window, 'localStorage', { value: localStorageMock });
+Object.defineProperty(window, 'sessionStorage', { value: sessionStorageMock });