diff --git a/.testr.conf b/.testr.conf
index 2109af6..8ecb52b 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./shaker/tests $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tests/__init__.py b/shaker/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to shaker/tests/__init__.py
diff --git a/tests/test_deploy.py b/shaker/tests/test_deploy.py
similarity index 100%
rename from tests/test_deploy.py
rename to shaker/tests/test_deploy.py
diff --git a/tests/test_flent_executor.py b/shaker/tests/test_flent_executor.py
similarity index 100%
rename from tests/test_flent_executor.py
rename to shaker/tests/test_flent_executor.py
diff --git a/tests/test_iperf_graph_executor.py b/shaker/tests/test_iperf_graph_executor.py
similarity index 100%
rename from tests/test_iperf_graph_executor.py
rename to shaker/tests/test_iperf_graph_executor.py
diff --git a/tests/test_lib.py b/shaker/tests/test_lib.py
similarity index 100%
rename from tests/test_lib.py
rename to shaker/tests/test_lib.py
diff --git a/tests/test_netperf_executor.py b/shaker/tests/test_netperf_executor.py
similarity index 100%
rename from tests/test_netperf_executor.py
rename to shaker/tests/test_netperf_executor.py
diff --git a/tests/test_netperf_wrapper_executor.py b/shaker/tests/test_netperf_wrapper_executor.py
similarity index 100%
rename from tests/test_netperf_wrapper_executor.py
rename to shaker/tests/test_netperf_wrapper_executor.py
diff --git a/tests/test_operations.py b/shaker/tests/test_operations.py
similarity index 100%
rename from tests/test_operations.py
rename to shaker/tests/test_operations.py
diff --git a/tests/test_quorum.py b/shaker/tests/test_quorum.py
similarity index 100%
rename from tests/test_quorum.py
rename to shaker/tests/test_quorum.py
diff --git a/tests/test_report.py b/shaker/tests/test_report.py
similarity index 100%
rename from tests/test_report.py
rename to shaker/tests/test_report.py
diff --git a/tests/test_server.py b/shaker/tests/test_server.py
similarity index 100%
rename from tests/test_server.py
rename to shaker/tests/test_server.py
diff --git a/tests/test_sla.py b/shaker/tests/test_sla.py
similarity index 100%
rename from tests/test_sla.py
rename to shaker/tests/test_sla.py
diff --git a/tests/test_traffic_aggregator.py b/shaker/tests/test_traffic_aggregator.py
similarity index 100%
rename from tests/test_traffic_aggregator.py
rename to shaker/tests/test_traffic_aggregator.py
diff --git a/tests/test_utils.py b/shaker/tests/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to shaker/tests/test_utils.py