diff --git a/src/sklearn_ann/cluster/tests/__init__.py b/src/sklearn_ann/cluster/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/sklearn_ann/cluster/tests/test_common.py b/tests/test_cluster.py
similarity index 100%
rename from src/sklearn_ann/cluster/tests/test_common.py
rename to tests/test_cluster.py
diff --git a/tests/conftest.py b/tests/test_kneighbors/conftest.py
similarity index 100%
rename from tests/conftest.py
rename to tests/test_kneighbors/conftest.py
diff --git a/tests/test_annoy.py b/tests/test_kneighbors/test_annoy.py
similarity index 100%
rename from tests/test_annoy.py
rename to tests/test_kneighbors/test_annoy.py
diff --git a/tests/test_common.py b/tests/test_kneighbors/test_common.py
similarity index 100%
rename from tests/test_common.py
rename to tests/test_kneighbors/test_common.py
diff --git a/tests/test_faiss.py b/tests/test_kneighbors/test_faiss.py
similarity index 100%
rename from tests/test_faiss.py
rename to tests/test_kneighbors/test_faiss.py
diff --git a/tests/test_nmslib.py b/tests/test_kneighbors/test_nmslib.py
similarity index 100%
rename from tests/test_nmslib.py
rename to tests/test_kneighbors/test_nmslib.py