diff --git a/aleksis/apps/matrix/tests/conftest.py b/aleksis/apps/matrix/tests/conftest.py
new file mode 100644
index 0000000000000000000000000000000000000000..eadfed813a9ec1b1bfe9b5e4b21374d70cd8992b
--- /dev/null
+++ b/aleksis/apps/matrix/tests/conftest.py
@@ -0,0 +1,55 @@
+import os
+
+import pytest
+import yaml
+from xprocess import ProcessStarter
+
+
+@pytest.fixture
+def synapse(xprocess, tmp_path):
+    path = os.path.dirname(__file__)
+    new_config_filename = os.path.join(tmp_path, "homeserver.yaml")
+
+    files_to_replace = [
+        "homeserver.yaml",
+        "matrix.aleksis.example.org.log.config",
+    ]
+    for filename in files_to_replace:
+        new_filename = os.path.join(tmp_path, filename)
+
+        with open(os.path.join(path, "synapse", filename), "r") as read_file:
+            content = read_file.read()
+
+        content = content.replace("%path%", path)
+        content = content.replace("%tmp_path%", str(tmp_path))
+
+        with open(new_filename, "w") as write_file:
+            write_file.write(content)
+
+    with open(new_config_filename, "r") as f:
+        config = yaml.safe_load(f)
+
+    config["server_url"] = "http://127.0.0.1:8008"
+
+    class SynapseStarter(ProcessStarter):
+        # startup pattern
+        pattern = "SynapseSite starting on 8008"
+
+        # command to start process
+        args = [
+            "python",
+            "-m",
+            "synapse.app.homeserver",
+            "--enable-registration",
+            "-c",
+            new_config_filename,
+        ]
+
+        max_read_lines = 400
+        timeout = 10
+
+    xprocess.ensure("synapse", SynapseStarter)
+
+    yield config
+
+    xprocess.getinfo("synapse").terminate()
diff --git a/synapse/homeserver.yaml b/aleksis/apps/matrix/tests/synapse/homeserver.yaml
similarity index 100%
rename from synapse/homeserver.yaml
rename to aleksis/apps/matrix/tests/synapse/homeserver.yaml
diff --git a/synapse/matrix.aleksis.example.org.log.config b/aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.log.config
similarity index 100%
rename from synapse/matrix.aleksis.example.org.log.config
rename to aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.log.config
diff --git a/synapse/matrix.aleksis.example.org.signing.key b/aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.signing.key
similarity index 100%
rename from synapse/matrix.aleksis.example.org.signing.key
rename to aleksis/apps/matrix/tests/synapse/matrix.aleksis.example.org.signing.key
diff --git a/conftest.py b/conftest.py
index bdd05deeafd0174838d11958e7a028cdb73d80eb..8dc44cfe41f00b97d89a12e90a35372b941aac95 100644
--- a/conftest.py
+++ b/conftest.py
@@ -5,53 +5,3 @@ import yaml
 from xprocess import ProcessStarter
 
 pytest_plugins = ("celery.contrib.pytest",)
-
-
-@pytest.fixture
-def synapse(xprocess, tmp_path):
-    path = os.path.dirname(__file__)
-    new_config_filename = os.path.join(tmp_path, "homeserver.yaml")
-
-    files_to_replace = [
-        "homeserver.yaml",
-        "matrix.aleksis.example.org.log.config",
-    ]
-    for filename in files_to_replace:
-        new_filename = os.path.join(tmp_path, filename)
-
-        with open(os.path.join(path, "synapse", filename), "r") as read_file:
-            content = read_file.read()
-
-        content = content.replace("%path%", path)
-        content = content.replace("%tmp_path%", str(tmp_path))
-
-        with open(new_filename, "w") as write_file:
-            write_file.write(content)
-
-    with open(new_config_filename, "r") as f:
-        config = yaml.safe_load(f)
-
-    config["server_url"] = "http://127.0.0.1:8008"
-
-    class SynapseStarter(ProcessStarter):
-        # startup pattern
-        pattern = "SynapseSite starting on 8008"
-
-        # command to start process
-        args = [
-            "python",
-            "-m",
-            "synapse.app.homeserver",
-            "--enable-registration",
-            "-c",
-            new_config_filename,
-        ]
-
-        max_read_lines = 400
-        timeout = 10
-
-    xprocess.ensure("synapse", SynapseStarter)
-
-    yield config
-
-    xprocess.getinfo("synapse").terminate()