diff --git a/__mocks__/redux-mock-store.js b/__mocks__/redux-mock-store.js
deleted file mode 100644
index 6282d915afd..00000000000
--- a/__mocks__/redux-mock-store.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import configureMockStore from 'redux-mock-store'; // eslint-disable-line
-import thunk from 'redux-thunk';
-
-const mockStore = configureMockStore([thunk]);
-
-export default mockStore;
diff --git a/src/message/__tests__/fetchActions-test.js b/src/message/__tests__/fetchActions-test.js
index 4bc5901497d..2c3ab150460 100644
--- a/src/message/__tests__/fetchActions-test.js
+++ b/src/message/__tests__/fetchActions-test.js
@@ -1,9 +1,12 @@
-import mockStore from 'redux-mock-store'; // eslint-disable-line
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
 
 import { fetchMessages, fetchOlder, fetchNewer } from '../fetchActions';
 import { streamNarrow, HOME_NARROW, HOME_NARROW_STR } from '../../utils/narrow';
 import { navStateWithNarrow } from '../../utils/testHelpers';
 
+const mockStore = configureStore([thunk]);
+
 const narrow = streamNarrow('some stream');
 const streamNarrowStr = JSON.stringify(narrow);
 
diff --git a/src/message/__tests__/messageActions-test.js b/src/message/__tests__/messageActions-test.js
index 1e2d58e13ca..b8a7934acf1 100644
--- a/src/message/__tests__/messageActions-test.js
+++ b/src/message/__tests__/messageActions-test.js
@@ -1,9 +1,12 @@
-import mockStore from 'redux-mock-store'; // eslint-disable-line
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
 
 import { doNarrow } from '../messagesActions';
 import { streamNarrow, HOME_NARROW, privateNarrow } from '../../utils/narrow';
 import { navStateWithNarrow } from '../../utils/testHelpers';
 
+const mockStore = configureStore([thunk]);
+
 const streamNarrowObj = streamNarrow('some stream');
 const streamNarrowStr = JSON.stringify(streamNarrowObj);