diff --git a/pytest.ini b/pytest.ini
index b6eb85190..4ff6ffaa1 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,7 @@
+# remove xain_fl testpath below once benchmarks and datasets are removed
+# TODO: separate unit and integration tests: https://xainag.atlassian.net/browse/XP-352
 [pytest]
-testpaths = xain_fl
+testpaths = xain_fl tests
 markers =
     unmarked: every test without a marker will automatically have this marker assigned. You could senselessly add it manually
     integration: mark a integration test
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/xain_fl/fl/coordinator/aggregate_test.py b/tests/aggregate_test.py
similarity index 100%
rename from xain_fl/fl/coordinator/aggregate_test.py
rename to tests/aggregate_test.py
diff --git a/xain_fl/cproto/conftest.py b/tests/conftest.py
similarity index 100%
rename from xain_fl/cproto/conftest.py
rename to tests/conftest.py
diff --git a/xain_fl/fl/coordinator/controller_test.py b/tests/controller_test.py
similarity index 100%
rename from xain_fl/fl/coordinator/controller_test.py
rename to tests/controller_test.py
diff --git a/xain_fl/cproto/test_coordinator.py b/tests/test_coordinator.py
similarity index 100%
rename from xain_fl/cproto/test_coordinator.py
rename to tests/test_coordinator.py
diff --git a/xain_fl/cproto/test_grpc.py b/tests/test_grpc.py
similarity index 100%
rename from xain_fl/cproto/test_grpc.py
rename to tests/test_grpc.py
diff --git a/xain_fl/cproto/test_participant.py b/tests/test_participant.py
similarity index 100%
rename from xain_fl/cproto/test_participant.py
rename to tests/test_participant.py