diff --git a/package.json b/package.json
index 8e0ee69..714db8e 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
       "^.+\\.[t|j]sx?$": "<rootDir>/node_modules/babel-jest"
     },
     "setupFiles": [
-      "./jest.setup.js"
+      "<rootDir>/jest.setup.js"
     ],
     "modulePathIgnorePatterns": [
       "<rootDir>/node_modules/"
diff --git a/src/client/actions/__tests__/CallActions-test.js b/src/client/actions/CallActions.test.js
similarity index 82%
rename from src/client/actions/__tests__/CallActions-test.js
rename to src/client/actions/CallActions.test.js
index 21da683..375c1bb 100644
--- a/src/client/actions/__tests__/CallActions-test.js
+++ b/src/client/actions/CallActions.test.js
@@ -1,14 +1,14 @@
-jest.mock('../../socket.js')
-jest.mock('../../window.js')
-jest.mock('../../store.js')
-jest.mock('../SocketActions.js')
+jest.mock('../socket.js')
+jest.mock('../window.js')
+jest.mock('../store.js')
+jest.mock('./SocketActions.js')
 
-import * as CallActions from '../CallActions.js'
-import * as SocketActions from '../SocketActions.js'
-import * as constants from '../../constants.js'
-import socket from '../../socket.js'
-import store from '../../store.js'
-import { callId, getUserMedia } from '../../window.js'
+import * as CallActions from './CallActions.js'
+import * as SocketActions from './SocketActions.js'
+import * as constants from '../constants.js'
+import socket from '../socket.js'
+import store from '../store.js'
+import { callId, getUserMedia } from '../window.js'
 
 jest.useFakeTimers()
 
diff --git a/src/client/actions/__tests__/PeerActions-test.js b/src/client/actions/PeerActions.test.js
similarity index 96%
rename from src/client/actions/__tests__/PeerActions-test.js
rename to src/client/actions/PeerActions.test.js
index dcaf9a3..e011607 100644
--- a/src/client/actions/__tests__/PeerActions-test.js
+++ b/src/client/actions/PeerActions.test.js
@@ -1,11 +1,11 @@
-jest.mock('../../window.js')
+jest.mock('../window.js')
 jest.mock('simple-peer')
 
-import * as PeerActions from '../PeerActions.js'
+import * as PeerActions from './PeerActions.js'
 import Peer from 'simple-peer'
 import { EventEmitter } from 'events'
-import { createStore } from '../../store.js'
-import { play } from '../../window.js'
+import { createStore } from '../store.js'
+import { play } from '../window.js'
 
 describe('PeerActions', () => {
   function createSocket () {
diff --git a/src/client/actions/__tests__/SocketActions-test.js b/src/client/actions/SocketActions.test.js
similarity index 95%
rename from src/client/actions/__tests__/SocketActions-test.js
rename to src/client/actions/SocketActions.test.js
index eb5f2e5..56900f9 100644
--- a/src/client/actions/__tests__/SocketActions-test.js
+++ b/src/client/actions/SocketActions.test.js
@@ -1,11 +1,11 @@
 jest.mock('simple-peer')
-jest.mock('../../window.js')
+jest.mock('../window.js')
 
-import * as SocketActions from '../SocketActions.js'
-import * as constants from '../../constants.js'
+import * as SocketActions from './SocketActions.js'
+import * as constants from '../constants.js'
 import Peer from 'simple-peer'
 import { EventEmitter } from 'events'
-import { createStore } from '../../store.js'
+import { createStore } from '../store.js'
 
 describe('SocketActions', () => {
   const roomName = 'bla'
diff --git a/src/client/components/__tests__/Input-test.js b/src/client/components/Input.test.js
similarity index 98%
rename from src/client/components/__tests__/Input-test.js
rename to src/client/components/Input.test.js
index af5ccda..2b1ff5f 100644
--- a/src/client/components/__tests__/Input-test.js
+++ b/src/client/components/Input.test.js
@@ -1,4 +1,4 @@
-import Input from '../Input.js'
+import Input from './Input.js'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import TestUtils from 'react-dom/test-utils'
diff --git a/src/client/components/__tests__/Toolbar-test.js b/src/client/components/Toolbar.test.js
similarity index 95%
rename from src/client/components/__tests__/Toolbar-test.js
rename to src/client/components/Toolbar.test.js
index 6b0d680..8baf47c 100644
--- a/src/client/components/__tests__/Toolbar-test.js
+++ b/src/client/components/Toolbar.test.js
@@ -1,9 +1,9 @@
-jest.mock('../../window.js')
+jest.mock('../window.js')
 import React from 'react'
 import ReactDOM from 'react-dom'
 import TestUtils from 'react-dom/test-utils'
-import Toolbar from '../Toolbar.js'
-import { MediaStream } from '../../window.js'
+import Toolbar from './Toolbar.js'
+import { MediaStream } from '../window.js'
 
 describe('components/Toolbar', () => {
 
diff --git a/src/client/components/__tests__/Video-test.js b/src/client/components/Video.test.js
similarity index 95%
rename from src/client/components/__tests__/Video-test.js
rename to src/client/components/Video.test.js
index 367b434..642f1b5 100644
--- a/src/client/components/__tests__/Video-test.js
+++ b/src/client/components/Video.test.js
@@ -1,9 +1,9 @@
-jest.mock('../../window.js')
+jest.mock('../window.js')
 import React from 'react'
 import ReactDOM from 'react-dom'
 import TestUtils from 'react-dom/test-utils'
-import Video from '../Video.js'
-import { MediaStream } from '../../window.js'
+import Video from './Video.js'
+import { MediaStream } from '../window.js'
 
 describe('components/Video', () => {
 
diff --git a/src/client/__tests__/App-test.js b/src/client/containers/App.test.js
similarity index 98%
rename from src/client/__tests__/App-test.js
rename to src/client/containers/App.test.js
index eed8939..bc6fa18 100644
--- a/src/client/__tests__/App-test.js
+++ b/src/client/containers/App.test.js
@@ -3,7 +3,7 @@ jest.mock('../socket.js')
 jest.mock('../window.js')
 
 import * as constants from '../constants.js'
-import App from '../containers/App.js'
+import App from './App.js'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import TestUtils from 'react-dom/test-utils'
diff --git a/src/client/__tests__/middlewares-test.js b/src/client/middlewares.test.js
similarity index 82%
rename from src/client/__tests__/middlewares-test.js
rename to src/client/middlewares.test.js
index cd03f76..9991969 100644
--- a/src/client/__tests__/middlewares-test.js
+++ b/src/client/middlewares.test.js
@@ -1,5 +1,5 @@
 import logger from 'redux-logger'
-import { create } from '../middlewares.js'
+import { create } from './middlewares.js'
 
 describe('store', () => {
 
diff --git a/src/client/reducers/__tests__/active-test.js b/src/client/reducers/active.test.js
similarity index 87%
rename from src/client/reducers/__tests__/active-test.js
rename to src/client/reducers/active.test.js
index e17dc77..0a38b5a 100644
--- a/src/client/reducers/__tests__/active-test.js
+++ b/src/client/reducers/active.test.js
@@ -1,5 +1,5 @@
-import * as StreamActions from '../../actions/StreamActions.js'
-import active from '../active.js'
+import * as StreamActions from '../actions/StreamActions.js'
+import active from './active.js'
 
 describe('reducers/active', () => {
 
diff --git a/src/client/reducers/__tests__/alerts-test.js b/src/client/reducers/alerts.test.js
similarity index 94%
rename from src/client/reducers/__tests__/alerts-test.js
rename to src/client/reducers/alerts.test.js
index 3b392ed..0e8ed63 100644
--- a/src/client/reducers/__tests__/alerts-test.js
+++ b/src/client/reducers/alerts.test.js
@@ -1,8 +1,8 @@
-import * as NotifyActions from '../../actions/NotifyActions.js'
+import * as NotifyActions from '../actions/NotifyActions.js'
 import _ from 'underscore'
 import { applyMiddleware, createStore } from 'redux'
-import { create } from '../../middlewares.js'
-import reducers from '../index.js'
+import { create } from '../middlewares.js'
+import reducers from './index.js'
 
 jest.useFakeTimers()
 
diff --git a/src/client/reducers/__tests__/messages-test.js b/src/client/reducers/messages.test.js
similarity index 86%
rename from src/client/reducers/__tests__/messages-test.js
rename to src/client/reducers/messages.test.js
index 83bfd7b..37c23a3 100644
--- a/src/client/reducers/__tests__/messages-test.js
+++ b/src/client/reducers/messages.test.js
@@ -1,5 +1,5 @@
-import * as ChatActions from '../../actions/ChatActions.js'
-import messages from '../messages.js'
+import * as ChatActions from '../actions/ChatActions.js'
+import messages from './messages.js'
 
 describe('reducers/messages', () => {
 
diff --git a/src/client/reducers/__tests__/streams-test.js b/src/client/reducers/streams.test.js
similarity index 86%
rename from src/client/reducers/__tests__/streams-test.js
rename to src/client/reducers/streams.test.js
index 5c281c2..f43070d 100644
--- a/src/client/reducers/__tests__/streams-test.js
+++ b/src/client/reducers/streams.test.js
@@ -1,10 +1,10 @@
-jest.mock('../../window.js')
+jest.mock('../window.js')
 
-import * as StreamActions from '../../actions/StreamActions.js'
-import reducers from '../index.js'
-import { createObjectURL, MediaStream } from '../../window.js'
+import * as StreamActions from '../actions/StreamActions.js'
+import reducers from './index.js'
+import { createObjectURL, MediaStream } from '../window.js'
 import { applyMiddleware, createStore } from 'redux'
-import { create } from '../../middlewares.js'
+import { create } from '../middlewares.js'
 
 describe('reducers/alerts', () => {
 
diff --git a/src/client/__tests__/window-test.js b/src/client/window.test.js
similarity index 99%
rename from src/client/__tests__/window-test.js
rename to src/client/window.test.js
index 097f473..b81904e 100644
--- a/src/client/__tests__/window-test.js
+++ b/src/client/window.test.js
@@ -7,7 +7,7 @@ import {
   navigator,
   play,
   valueOf
-} from '../window.js'
+} from './window.js'
 
 describe('window', () => {
 
diff --git a/src/server/__tests__/app-test.js b/src/server/app.test.js
similarity index 91%
rename from src/server/__tests__/app-test.js
rename to src/server/app.test.js
index d77457c..1ea6357 100644
--- a/src/server/__tests__/app-test.js
+++ b/src/server/app.test.js
@@ -2,11 +2,11 @@ jest.mock('socket.io', () => {
   const { EventEmitter } = require('events')
   return jest.fn().mockReturnValue(new EventEmitter())
 })
-jest.mock('../socket.js')
+jest.mock('./socket.js')
 
-const app = require('../app.js')
+const app = require('./app.js')
 const config = require('config')
-const handleSocket = require('../socket.js')
+const handleSocket = require('./socket.js')
 const io = require('socket.io')()
 const request = require('supertest')
 
diff --git a/src/server/__tests__/server-test.js b/src/server/server.test.js
similarity index 93%
rename from src/server/__tests__/server-test.js
rename to src/server/server.test.js
index 1e953f8..3adc808 100644
--- a/src/server/__tests__/server-test.js
+++ b/src/server/server.test.js
@@ -1,7 +1,7 @@
 const express = require('express')
 const http = require('http')
 const https = require('https')
-const { createServer } = require('../server.js')
+const { createServer } = require('./server.js')
 
 describe('server', () => {
 
diff --git a/src/server/__tests__/socket-test.js b/src/server/socket.test.js
similarity index 98%
rename from src/server/__tests__/socket-test.js
rename to src/server/socket.test.js
index 8d13e72..dff952c 100644
--- a/src/server/__tests__/socket-test.js
+++ b/src/server/socket.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const EventEmitter = require('events').EventEmitter
-const handleSocket = require('../socket.js')
+const handleSocket = require('./socket.js')
 
 describe('server/socket', () => {
   let socket, io, rooms
diff --git a/src/server/__tests__/turn-test.js b/src/server/turn.test.js
similarity index 97%
rename from src/server/__tests__/turn-test.js
rename to src/server/turn.test.js
index 5d21a87..e48edaa 100644
--- a/src/server/__tests__/turn-test.js
+++ b/src/server/turn.test.js
@@ -1,4 +1,4 @@
-const turn = require('../turn.js')
+const turn = require('./turn.js')
 
 describe('server/turn', () => {
   describe('getCredentials', () => {