diff --git a/Makefile b/Makefile
index 05e7217454..6e4e89a98b 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ test-go:
 	go test -cover $(shell glide nv)
 
 test-js:
-	_mocha --compilers js:babel-core/register,tsx:typescript-require  \
+	NODE_PATH=./frontend _mocha --compilers js:babel-core/register,tsx:typescript-require  \
 		--recursive 'frontend/**/*.tests.js*' \
 		--require ignore-styles \
 		--require 'frontend/.test.setup.js' \
diff --git a/frontend/components/queries/NewQuery/NewQuery.jsx b/frontend/components/queries/NewQuery/NewQuery.jsx
index c06b41fdcd..64b05192d6 100644
--- a/frontend/components/queries/NewQuery/NewQuery.jsx
+++ b/frontend/components/queries/NewQuery/NewQuery.jsx
@@ -3,16 +3,16 @@ import AceEditor from 'react-ace';
 import 'brace/ext/linking';
 import radium from 'radium';
 
+import Button from 'components/buttons/Button';
+import debounce from 'utilities/debounce';
+import SaveQueryFormModal from 'components/modals/SaveQueryFormModal';
+import SelectTargetsInput from 'components/queries/SelectTargetsInput';
+import SelectTargetsMenu from 'components/queries/SelectTargetsMenu';
+import targetInterface from 'interfaces/target';
+import ThemeDropdown from 'components/queries/NewQuery/ThemeDropdown';
+import { validateQuery } from 'components/queries/NewQuery/helpers';
 import './mode';
 import './theme';
-import Button from '../../buttons/Button';
-import debounce from '../../../utilities/debounce';
-import SaveQueryFormModal from '../../modals/SaveQueryFormModal';
-import SelectTargetsInput from '../SelectTargetsInput';
-import SelectTargetsMenu from '../SelectTargetsMenu';
-import targetInterface from '../../../interfaces/target';
-import ThemeDropdown from './ThemeDropdown';
-import { validateQuery } from './helpers';
 
 const baseClass = 'new-query';
 
diff --git a/frontend/components/queries/NewQuery/NewQuery.tests.jsx b/frontend/components/queries/NewQuery/NewQuery.tests.jsx
index dd1eecc3f2..5a144d5d70 100644
--- a/frontend/components/queries/NewQuery/NewQuery.tests.jsx
+++ b/frontend/components/queries/NewQuery/NewQuery.tests.jsx
@@ -3,7 +3,7 @@ import expect, { createSpy, restoreSpies } from 'expect';
 import { mount } from 'enzyme';
 import { noop } from 'lodash';
 
-import { createAceSpy, fillInFormInput } from '../../../test/helpers';
+import { createAceSpy, fillInFormInput } from 'test/helpers';
 import NewQuery from './index';
 
 describe('NewQuery - component', () => {
diff --git a/package.json b/package.json
index b48442ce15..c59809d54e 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
     "babel-eslint": "^6.1.2",
     "eslint": "3.6.0",
     "eslint-config-airbnb": "12.0.0",
+    "eslint-import-resolver-webpack": "^0.6.0",
     "eslint-plugin-import": "1.16.0",
     "eslint-plugin-jsx-a11y": "2.2.2",
     "eslint-plugin-react": "6.3.0",
diff --git a/webpack.config.js b/webpack.config.js
index 99963399c4..41ea83158c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -59,7 +59,10 @@ var config  = {
     alias: {
       '#app': path.join(repo, 'frontend'),
       '#components': path.join(repo, 'frontend/components'),
-    }
+    },
+    root: [
+      path.resolve(path.join(repo, './frontend'))
+    ]
   },
   svgo1: {
     multipass: true,