diff --git a/.eslintrc b/.eslintrc
index 40e444f8..b6209439 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -19,7 +19,8 @@
     "browser": true,
     "node": true,
     "amd": true,
-    "es6": true
+    "es6": true,
+    "jest": true
   },
 
   "rules": {
diff --git a/js/__tests__/Band-test.js b/js/components/Band.test.js
similarity index 97%
rename from js/__tests__/Band-test.js
rename to js/components/Band.test.js
index b4872ebc..f05d541d 100644
--- a/js/__tests__/Band-test.js
+++ b/js/components/Band.test.js
@@ -1,7 +1,7 @@
 import {
   spriteNumber,
   spriteOffsets
-} from '../components/Band';
+} from './Band';
 
 describe('spriteNumber', () => {
   it('gives the first sprite', () => {
diff --git a/js/__tests__/Character-test.js b/js/components/Character.test.js
similarity index 85%
rename from js/__tests__/Character-test.js
rename to js/components/Character.test.js
index 9fd1a319..cde5c590 100644
--- a/js/__tests__/Character-test.js
+++ b/js/components/Character.test.js
@@ -1,4 +1,4 @@
-import {characterClassName} from '../components/Character';
+import {characterClassName} from './Character';
 
 describe('characterClassName', () => {
   it('is not case sensitive', () => {
diff --git a/js/__tests__/EqGraph-test.js b/js/components/EqGraph.test.js
similarity index 94%
rename from js/__tests__/EqGraph-test.js
rename to js/components/EqGraph.test.js
index 74cf29d9..efc4d4f8 100644
--- a/js/__tests__/EqGraph-test.js
+++ b/js/components/EqGraph.test.js
@@ -1,6 +1,6 @@
 import {
   roundToEven
-} from '../components/EqGraph';
+} from './EqGraph';
 
 describe('roundToEven', () => {
   it('leaves even numbers as is', () => {
diff --git a/js/__tests__/MainWindow.js b/js/components/MainWindow.test.js
similarity index 95%
rename from js/__tests__/MainWindow.js
rename to js/components/MainWindow.test.js
index 8371934b..b5dd0e4f 100644
--- a/js/__tests__/MainWindow.js
+++ b/js/components/MainWindow.test.js
@@ -23,7 +23,7 @@ import {Provider} from 'react-redux';
 import renderer from 'react-test-renderer';
 import getStore from '../store';
 
-import MainWindow from '../components/MainWindow';
+import MainWindow from './MainWindow';
 
 describe('MainWindow', () => {
   let store;
diff --git a/js/__tests__/Marquee-test.js b/js/components/Marquee.test.js
similarity index 99%
rename from js/__tests__/Marquee-test.js
rename to js/components/Marquee.test.js
index 5e2c567f..59c3f510 100644
--- a/js/__tests__/Marquee-test.js
+++ b/js/components/Marquee.test.js
@@ -7,7 +7,7 @@ import {
   stepOffset,
   negativePixels,
   loopText
-} from '../components/Marquee';
+} from './Marquee';
 
 describe('getBalanceText', () => {
   it('treats negative numbers as left', () => {
diff --git a/js/__tests__/__snapshots__/MainWindow.js.snap b/js/components/__snapshots__/MainWindow.test.js.snap
similarity index 100%
rename from js/__tests__/__snapshots__/MainWindow.js.snap
rename to js/components/__snapshots__/MainWindow.test.js.snap
diff --git a/js/__tests__/reducers-test.js b/js/reducers.test.js
similarity index 92%
rename from js/__tests__/reducers-test.js
rename to js/reducers.test.js
index d0965f80..302c2ead 100644
--- a/js/__tests__/reducers-test.js
+++ b/js/reducers.test.js
@@ -1,9 +1,9 @@
-import {userInput} from '../reducers';
+import {userInput} from './reducers';
 import {
   SET_FOCUS,
   SET_SCRUB_POSITION,
   UNSET_FOCUS
-} from '../actionTypes';
+} from './actionTypes';
 
 describe('userInput reducer', () => {
   const state = userInput();
diff --git a/js/__tests__/skinSprites-test.js b/js/skinSprites.test.js
similarity index 96%
rename from js/__tests__/skinSprites-test.js
rename to js/skinSprites.test.js
index bb167773..beaac613 100644
--- a/js/__tests__/skinSprites-test.js
+++ b/js/skinSprites.test.js
@@ -1,4 +1,4 @@
-import skinSprites from '../skinSprites';
+import skinSprites from './skinSprites';
 
 const getNames = (arr) => arr.map((item) => item.name);
 
diff --git a/js/__tests__/snapUtils-test.js b/js/snapUtils.test.js
similarity index 99%
rename from js/__tests__/snapUtils-test.js
rename to js/snapUtils.test.js
index cf408d0c..1af8b737 100644
--- a/js/__tests__/snapUtils-test.js
+++ b/js/snapUtils.test.js
@@ -9,7 +9,7 @@ import {
   overlapX,
   snapWithin,
   applySnap
-} from '../snapUtils';
+} from './snapUtils';
 
 describe('side functions', () => {
   const box = {x: 10, y: 15, width: 50, height: 100};
diff --git a/js/__tests__/utils-test.js b/js/utils.test.js
similarity index 99%
rename from js/__tests__/utils-test.js
rename to js/utils.test.js
index 9a5308e1..c21b51e4 100644
--- a/js/__tests__/utils-test.js
+++ b/js/utils.test.js
@@ -6,7 +6,7 @@ import {
   clamp,
   parseViscolors,
   parseIni
-} from '../utils';
+} from './utils';
 
 const fixture = (filename) => (
     fs.readFileSync(`./js/__tests__/fixtures/${filename}`).toString()
diff --git a/package.json b/package.json
index 263fa42d..5a969634 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "redux-thunk": "^2.1.0"
   },
   "jest": {
+    "testRegex": "\\.test\\.js$",
     "moduleNameMapper": {
       "\\.css$": "<rootDir>/js/__mocks__/styleMock.js"
     }