diff --git a/tests/unit/coordinates/psp/__init__.py b/tests/unit/coordinates/psp/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/unit/coordinates/test_base.py b/tests/unit/coordinates/psp/test_base.py
similarity index 100%
rename from tests/unit/coordinates/test_base.py
rename to tests/unit/coordinates/psp/test_base.py
diff --git a/tests/unit/coordinates/test_psp.py b/tests/unit/coordinates/psp/test_psp.py
similarity index 100%
rename from tests/unit/coordinates/test_psp.py
rename to tests/unit/coordinates/psp/test_psp.py
diff --git a/tests/unit/coordinates/test_pspt.py b/tests/unit/coordinates/psp/test_pspt.py
similarity index 100%
rename from tests/unit/coordinates/test_pspt.py
rename to tests/unit/coordinates/psp/test_pspt.py
diff --git a/tests/unit/coordinates/test_utils.py b/tests/unit/coordinates/psp/test_utils.py
similarity index 100%
rename from tests/unit/coordinates/test_utils.py
rename to tests/unit/coordinates/psp/test_utils.py
diff --git a/tests/unit/dynamics/test_orbit.py b/tests/unit/dynamics/test_orbit.py
index 9c2ad910..ec1bd9b5 100644
--- a/tests/unit/dynamics/test_orbit.py
+++ b/tests/unit/dynamics/test_orbit.py
@@ -8,8 +8,8 @@
 
 from jax_quantity import Quantity
 
-from ..coordinates.test_base import Shape, return_keys
-from ..coordinates.test_pspt import AbstractPhaseSpaceTimePosition_Test, T
+from ..coordinates.psp.test_base import Shape, return_keys
+from ..coordinates.psp.test_pspt import AbstractPhaseSpaceTimePosition_Test, T
 from galax.coordinates import PhaseSpaceTimePosition
 from galax.dynamics import Orbit
 from galax.potential import AbstractPotentialBase, MilkyWayPotential