diff --git a/client/__test__/mocks/fileMock.js b/client/__mocks__/fileMock.js
similarity index 100%
rename from client/__test__/mocks/fileMock.js
rename to client/__mocks__/fileMock.js
diff --git a/client/components/__test__/Nav.test.jsx b/client/components/Nav.unit.test.jsx
similarity index 97%
rename from client/components/__test__/Nav.test.jsx
rename to client/components/Nav.unit.test.jsx
index dfb122fbc9..cb9f11cab0 100644
--- a/client/components/__test__/Nav.test.jsx
+++ b/client/components/Nav.unit.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 
-import { NavComponent } from '../Nav';
+import { NavComponent } from './Nav';
 
 describe('Nav', () => {
   const props = {
diff --git a/client/components/__test__/__snapshots__/Nav.test.jsx.snap b/client/components/__snapshots__/Nav.unit.test.jsx.snap
similarity index 100%
rename from client/components/__test__/__snapshots__/Nav.test.jsx.snap
rename to client/components/__snapshots__/Nav.unit.test.jsx.snap
diff --git a/client/modules/IDE/components/FileNode.test.jsx b/client/modules/IDE/components/FileNode.unit.test.jsx
similarity index 100%
rename from client/modules/IDE/components/FileNode.test.jsx
rename to client/modules/IDE/components/FileNode.unit.test.jsx
diff --git a/client/modules/IDE/components/Toolbar.test.jsx b/client/modules/IDE/components/Toolbar.unit.test.jsx
similarity index 100%
rename from client/modules/IDE/components/Toolbar.test.jsx
rename to client/modules/IDE/components/Toolbar.unit.test.jsx
diff --git a/package.json b/package.json
index a154070c64..a65c993cc1 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
           "<rootDir>/client/jest.setup.js"
         ],
         "moduleNameMapper": {
-          "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/client/__test__/mocks/fileMock.js"
+          "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/client/__mocks__/fileMock.js"
         },
         "testMatch": [
           "<rootDir>/client/**/*.test.(js|jsx)"