diff --git a/karma.conf.js b/karma.conf.js
index 8cdfd16..4248f81 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function(config) {
         // list of files / patterns to load in the browser
         files: [
             'dll/vendor.dll.js',
-            'tests/index.js'
+            'src/test.js'
         ],
 
         // list of files to exclude
@@ -26,7 +26,7 @@ module.exports = function(config) {
         // preprocess matching files before serving them to the browser
         // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
         preprocessors: {
-            'tests/index.js': ['webpack', 'sourcemap']
+            'src/test.js': ['webpack', 'sourcemap']
         },
 
         webpack: require('./webpack.config.js'),
diff --git a/tests/components/accounts/actions.test.js b/src/components/accounts/actions.test.js
similarity index 100%
rename from tests/components/accounts/actions.test.js
rename to src/components/accounts/actions.test.js
diff --git a/tests/components/accounts/reducer.test.js b/src/components/accounts/reducer.test.js
similarity index 100%
rename from tests/components/accounts/reducer.test.js
rename to src/components/accounts/reducer.test.js
diff --git a/tests/components/auth/actions.test.js b/src/components/auth/actions.test.js
similarity index 100%
rename from tests/components/auth/actions.test.js
rename to src/components/auth/actions.test.js
diff --git a/tests/components/auth/reducer.test.js b/src/components/auth/reducer.test.js
similarity index 100%
rename from tests/components/auth/reducer.test.js
rename to src/components/auth/reducer.test.js
diff --git a/tests/components/contact/ContactForm.test.jsx b/src/components/contact/ContactForm.test.jsx
similarity index 100%
rename from tests/components/contact/ContactForm.test.jsx
rename to src/components/contact/ContactForm.test.jsx
diff --git a/tests/components/profile/changePassword/ChangePassword.test.jsx b/src/components/profile/changePassword/ChangePassword.test.jsx
similarity index 100%
rename from tests/components/profile/changePassword/ChangePassword.test.jsx
rename to src/components/profile/changePassword/ChangePassword.test.jsx
diff --git a/tests/components/ui/bsod/BsodMiddleware.test.js b/src/components/ui/bsod/BsodMiddleware.test.js
similarity index 100%
rename from tests/components/ui/bsod/BsodMiddleware.test.js
rename to src/components/ui/bsod/BsodMiddleware.test.js
diff --git a/tests/components/ui/popup/PopupStack.test.jsx b/src/components/ui/popup/PopupStack.test.jsx
similarity index 100%
rename from tests/components/ui/popup/PopupStack.test.jsx
rename to src/components/ui/popup/PopupStack.test.jsx
diff --git a/tests/components/ui/popup/reducer.test.js b/src/components/ui/popup/reducer.test.js
similarity index 100%
rename from tests/components/ui/popup/reducer.test.js
rename to src/components/ui/popup/reducer.test.js
diff --git a/tests/components/user/actions.test.js b/src/components/user/actions.test.js
similarity index 100%
rename from tests/components/user/actions.test.js
rename to src/components/user/actions.test.js
diff --git a/tests/components/user/middlewares/bearerHeaderMiddleware.test.js b/src/components/user/middlewares/bearerHeaderMiddleware.test.js
similarity index 100%
rename from tests/components/user/middlewares/bearerHeaderMiddleware.test.js
rename to src/components/user/middlewares/bearerHeaderMiddleware.test.js
diff --git a/tests/components/user/middlewares/refreshTokenMiddleware.test.js b/src/components/user/middlewares/refreshTokenMiddleware.test.js
similarity index 100%
rename from tests/components/user/middlewares/refreshTokenMiddleware.test.js
rename to src/components/user/middlewares/refreshTokenMiddleware.test.js
diff --git a/tests/polyfills.test.js b/src/polyfills.test.js
similarity index 100%
rename from tests/polyfills.test.js
rename to src/polyfills.test.js
diff --git a/tests/services/api/activate.test.js b/src/services/api/activate.test.js
similarity index 100%
rename from tests/services/api/activate.test.js
rename to src/services/api/activate.test.js
diff --git a/tests/services/api/authentication.test.js b/src/services/api/authentication.test.js
similarity index 100%
rename from tests/services/api/authentication.test.js
rename to src/services/api/authentication.test.js
diff --git a/tests/services/authFlow/AcceptRulesState.test.js b/src/services/authFlow/AcceptRulesState.test.js
similarity index 100%
rename from tests/services/authFlow/AcceptRulesState.test.js
rename to src/services/authFlow/AcceptRulesState.test.js
diff --git a/tests/services/authFlow/ActivationState.test.js b/src/services/authFlow/ActivationState.test.js
similarity index 100%
rename from tests/services/authFlow/ActivationState.test.js
rename to src/services/authFlow/ActivationState.test.js
diff --git a/tests/services/authFlow/AuthFlow.functional.test.js b/src/services/authFlow/AuthFlow.functional.test.js
similarity index 100%
rename from tests/services/authFlow/AuthFlow.functional.test.js
rename to src/services/authFlow/AuthFlow.functional.test.js
diff --git a/tests/services/authFlow/AuthFlow.test.js b/src/services/authFlow/AuthFlow.test.js
similarity index 100%
rename from tests/services/authFlow/AuthFlow.test.js
rename to src/services/authFlow/AuthFlow.test.js
diff --git a/tests/services/authFlow/ChooseAccountState.test.js b/src/services/authFlow/ChooseAccountState.test.js
similarity index 100%
rename from tests/services/authFlow/ChooseAccountState.test.js
rename to src/services/authFlow/ChooseAccountState.test.js
diff --git a/tests/services/authFlow/CompleteState.test.js b/src/services/authFlow/CompleteState.test.js
similarity index 100%
rename from tests/services/authFlow/CompleteState.test.js
rename to src/services/authFlow/CompleteState.test.js
diff --git a/tests/services/authFlow/FinishState.test.js b/src/services/authFlow/FinishState.test.js
similarity index 100%
rename from tests/services/authFlow/FinishState.test.js
rename to src/services/authFlow/FinishState.test.js
diff --git a/tests/services/authFlow/ForgotPasswordState.test.js b/src/services/authFlow/ForgotPasswordState.test.js
similarity index 100%
rename from tests/services/authFlow/ForgotPasswordState.test.js
rename to src/services/authFlow/ForgotPasswordState.test.js
diff --git a/tests/services/authFlow/LoginState.test.js b/src/services/authFlow/LoginState.test.js
similarity index 100%
rename from tests/services/authFlow/LoginState.test.js
rename to src/services/authFlow/LoginState.test.js
diff --git a/tests/services/authFlow/OAuthState.test.js b/src/services/authFlow/OAuthState.test.js
similarity index 100%
rename from tests/services/authFlow/OAuthState.test.js
rename to src/services/authFlow/OAuthState.test.js
diff --git a/tests/services/authFlow/PasswordState.test.js b/src/services/authFlow/PasswordState.test.js
similarity index 100%
rename from tests/services/authFlow/PasswordState.test.js
rename to src/services/authFlow/PasswordState.test.js
diff --git a/tests/services/authFlow/PermissionsState.test.js b/src/services/authFlow/PermissionsState.test.js
similarity index 100%
rename from tests/services/authFlow/PermissionsState.test.js
rename to src/services/authFlow/PermissionsState.test.js
diff --git a/tests/services/authFlow/RecoverPasswordState.test.js b/src/services/authFlow/RecoverPasswordState.test.js
similarity index 100%
rename from tests/services/authFlow/RecoverPasswordState.test.js
rename to src/services/authFlow/RecoverPasswordState.test.js
diff --git a/tests/services/authFlow/RegisterState.test.js b/src/services/authFlow/RegisterState.test.js
similarity index 100%
rename from tests/services/authFlow/RegisterState.test.js
rename to src/services/authFlow/RegisterState.test.js
diff --git a/tests/services/authFlow/ResendActivationState.test.js b/src/services/authFlow/ResendActivationState.test.js
similarity index 100%
rename from tests/services/authFlow/ResendActivationState.test.js
rename to src/services/authFlow/ResendActivationState.test.js
diff --git a/tests/services/authFlow/helpers.js b/src/services/authFlow/helpers.js
similarity index 100%
rename from tests/services/authFlow/helpers.js
rename to src/services/authFlow/helpers.js
diff --git a/tests/services/request/PromiseMiddlewareLayer.test.js b/src/services/request/PromiseMiddlewareLayer.test.js
similarity index 100%
rename from tests/services/request/PromiseMiddlewareLayer.test.js
rename to src/services/request/PromiseMiddlewareLayer.test.js
diff --git a/tests/services/request/request.test.js b/src/services/request/request.test.js
similarity index 100%
rename from tests/services/request/request.test.js
rename to src/services/request/request.test.js
diff --git a/tests/index.js b/src/test.js
similarity index 91%
rename from tests/index.js
rename to src/test.js
index beb5975..d6775d7 100644
--- a/tests/index.js
+++ b/src/test.js
@@ -21,7 +21,7 @@ if (!window.localStorage) {
     };
 }
 
-// require all modules ending in "_test" from the
+// require all modules ending in ".test.js" from the
 // current directory and all subdirectories
 const testsContext = require.context('.', true, /\.test\.jsx?$/);
 testsContext.keys().forEach(testsContext);
diff --git a/tests/.eslintrc.json b/tests/.eslintrc.json
deleted file mode 100644
index 6ec8b14..0000000
--- a/tests/.eslintrc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es6": true,
-        "mocha": true
-    }
-}