diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..e950d07f2
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+pulser-simulation/ @pasqal-io/emulation-team
+tests/pulser_simulation/* @pasqal-io/emulation-team
\ No newline at end of file
diff --git a/tests/test_qutip_backend.py b/tests/pulser_simulation/test_qutip_backend.py
similarity index 100%
rename from tests/test_qutip_backend.py
rename to tests/pulser_simulation/test_qutip_backend.py
diff --git a/tests/test_qutip_state_op.py b/tests/pulser_simulation/test_qutip_state_op.py
similarity index 100%
rename from tests/test_qutip_state_op.py
rename to tests/pulser_simulation/test_qutip_state_op.py
diff --git a/tests/test_simconfig.py b/tests/pulser_simulation/test_simconfig.py
similarity index 100%
rename from tests/test_simconfig.py
rename to tests/pulser_simulation/test_simconfig.py
diff --git a/tests/test_simresults.py b/tests/pulser_simulation/test_simresults.py
similarity index 100%
rename from tests/test_simresults.py
rename to tests/pulser_simulation/test_simresults.py
diff --git a/tests/test_simulation.py b/tests/pulser_simulation/test_simulation.py
similarity index 100%
rename from tests/test_simulation.py
rename to tests/pulser_simulation/test_simulation.py