diff --git a/tests/data/camera_image_sample.json b/tests-legacy/data/camera_image_sample.json
similarity index 100%
rename from tests/data/camera_image_sample.json
rename to tests-legacy/data/camera_image_sample.json
diff --git a/tests/data/dispatching_layer_sample.json b/tests-legacy/data/dispatching_layer_sample.json
similarity index 100%
rename from tests/data/dispatching_layer_sample.json
rename to tests-legacy/data/dispatching_layer_sample.json
diff --git a/tests/data/dispatching_layer_sample.json.txt b/tests-legacy/data/dispatching_layer_sample.json.txt
similarity index 100%
rename from tests/data/dispatching_layer_sample.json.txt
rename to tests-legacy/data/dispatching_layer_sample.json.txt
diff --git a/tests/manual_broker_test.py b/tests-legacy/manual_broker_test.py
similarity index 100%
rename from tests/manual_broker_test.py
rename to tests-legacy/manual_broker_test.py
diff --git a/tests/perf_writer_format.py b/tests-legacy/perf_writer_format.py
similarity index 100%
rename from tests/perf_writer_format.py
rename to tests-legacy/perf_writer_format.py
diff --git a/tests/test_StreamRequestSender.py b/tests-legacy/test_StreamRequestSender.py
similarity index 100%
rename from tests/test_StreamRequestSender.py
rename to tests-legacy/test_StreamRequestSender.py
diff --git a/tests/test_broker.py b/tests-legacy/test_broker.py
similarity index 100%
rename from tests/test_broker.py
rename to tests-legacy/test_broker.py
diff --git a/tests/test_broker_manager.py b/tests-legacy/test_broker_manager.py
similarity index 100%
rename from tests/test_broker_manager.py
rename to tests-legacy/test_broker_manager.py
diff --git a/tests/test_utils.py b/tests-legacy/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to tests-legacy/test_utils.py
diff --git a/tests/test_writer.py b/tests-legacy/test_writer.py
similarity index 100%
rename from tests/test_writer.py
rename to tests-legacy/test_writer.py
diff --git a/tests/test_writer_format.py b/tests-legacy/test_writer_format.py
similarity index 100%
rename from tests/test_writer_format.py
rename to tests-legacy/test_writer_format.py
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29..0000000