diff --git a/tests/__init__.py b/test/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to test/__init__.py
diff --git a/tests/add_appointment_test.py b/test/add_appointment_test.py
similarity index 98%
rename from tests/add_appointment_test.py
rename to test/add_appointment_test.py
index caccfdc..68fea80 100644
--- a/tests/add_appointment_test.py
+++ b/test/add_appointment_test.py
@@ -7,7 +7,7 @@ from hashlib import sha256
 from binascii import hexlify, unhexlify
 from apps.cli.blob import Blob
 from pisa import HOST, PORT
-from pisa.utils.authproxy import AuthServiceProxy
+from pisa.utils.auth_proxy import AuthServiceProxy
 from pisa.conf import BTC_RPC_USER, BTC_RPC_PASSWD, BTC_RPC_HOST, BTC_RPC_PORT
 
 PISA_API = "http://{}:{}".format(HOST, PORT)
diff --git a/tests/appointment_tests.py b/test/appointment_tests.py
similarity index 100%
rename from tests/appointment_tests.py
rename to test/appointment_tests.py
diff --git a/tests/simulator/__init__.py b/test/simulator/__init__.py
similarity index 100%
rename from tests/simulator/__init__.py
rename to test/simulator/__init__.py
diff --git a/tests/simulator/bitcoin_sim_tests.py b/test/simulator/bitcoin_sim_tests.py
similarity index 100%
rename from tests/simulator/bitcoin_sim_tests.py
rename to test/simulator/bitcoin_sim_tests.py
diff --git a/tests/simulator/bitcoind_sim.py b/test/simulator/bitcoind_sim.py
similarity index 99%
rename from tests/simulator/bitcoind_sim.py
rename to test/simulator/bitcoind_sim.py
index d9b902d..9ba6089 100644
--- a/tests/simulator/bitcoind_sim.py
+++ b/test/simulator/bitcoind_sim.py
@@ -1,6 +1,6 @@
 from pisa.conf import FEED_PROTOCOL, FEED_ADDR, FEED_PORT
 from flask import Flask, request, Response, abort
-from tests.simulator.zmq_publisher import ZMQPublisher
+from test.simulator.zmq_publisher import ZMQPublisher
 from threading import Thread
 from pisa.rpc_errors import *
 from pisa.tools import check_txid_format
diff --git a/tests/simulator/zmq_publisher.py b/test/simulator/zmq_publisher.py
similarity index 100%
rename from tests/simulator/zmq_publisher.py
rename to test/simulator/zmq_publisher.py
diff --git a/test/unit/__init__.py b/test/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_cleaner.py b/test/unit/test_cleaner.py
similarity index 100%
rename from tests/test_cleaner.py
rename to test/unit/test_cleaner.py