diff --git a/src/aura_engine_api/rest/test/__init__.py b/src/aura_engine_api/rest/test/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..d6ca842c65565c22e76894e6c88334661658e510
--- /dev/null
+++ b/src/aura_engine_api/rest/test/__init__.py
@@ -0,0 +1,15 @@
+import logging
+
+import connexion
+from flask_testing import TestCase
+
+from aura_engine_api.rest.encoder import JSONEncoder
+
+
+class BaseTestCase(TestCase):
+    def create_app(self):
+        logging.getLogger("connexion.operation").setLevel("ERROR")
+        app = connexion.App(__name__, specification_dir="../swagger/")
+        app.app.json_encoder = JSONEncoder
+        app.add_api("swagger.yaml")
+        return app.app
diff --git a/tests/__init__.py b/tests/__init__.py
index d6ca842c65565c22e76894e6c88334661658e510..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,15 +0,0 @@
-import logging
-
-import connexion
-from flask_testing import TestCase
-
-from aura_engine_api.rest.encoder import JSONEncoder
-
-
-class BaseTestCase(TestCase):
-    def create_app(self):
-        logging.getLogger("connexion.operation").setLevel("ERROR")
-        app = connexion.App(__name__, specification_dir="../swagger/")
-        app.app.json_encoder = JSONEncoder
-        app.add_api("swagger.yaml")
-        return app.app
diff --git a/tests/test_internal_controller.py b/tests/test_internal_controller.py
index a50911473d38709dc4f194a021709bb4223fb5be..b36b93f1bd40450666b6d9ebd6b50e32e4c92566 100644
--- a/tests/test_internal_controller.py
+++ b/tests/test_internal_controller.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import
 from flask import json
 
 from aura_engine_api.rest.models.clock_info import ClockInfo  # noqa: E501
-from tests import BaseTestCase
+from aura_engine_api.rest.test import BaseTestCase
 
 
 class TestInternalController(BaseTestCase):
diff --git a/tests/test_public_controller.py b/tests/test_public_controller.py
index 4d22c26ba9383413128b2e6d5ee2cefe920a4f89..431bb7656bf543ff9b2ee294b3edeb5b8d63183c 100644
--- a/tests/test_public_controller.py
+++ b/tests/test_public_controller.py
@@ -20,7 +20,7 @@
 from __future__ import absolute_import
 
 # from aura_engine_api.rest.models.track import Track  # noqa: E501
-from tests import BaseTestCase
+from aura_engine_api.rest.test import BaseTestCase
 
 # from flask import json
 # from six import BytesIO