diff --git a/tests/test_chat.py b/tests/test_chat.py
new file mode 100644
index 0000000..51c2b0d
--- /dev/null
+++ b/tests/test_chat.py
@@ -0,0 +1,14 @@
+from tests import client, app
+
+class TestChat:
+    def test_api_chat(self, client):
+        response = client.get("/api/chat/")
+        assert response.status_code == 200
+
+    def test_api_chat_messages_1(self, client):
+        response = client.get("/api/chat/messages/1")
+        assert response.status_code == 200
+
+    def test_api_chat_new_message(self, client):
+        response = client.post("/api/chat/new_message")
+        assert response.status_code == 200
diff --git a/tests/test_mate.py b/tests/test_mate.py
new file mode 100644
index 0000000..18279aa
--- /dev/null
+++ b/tests/test_mate.py
@@ -0,0 +1,14 @@
+from tests import client, app
+
+class TestMate:
+    def test_api_mate(self, client):
+        response = client.get("/api/mate")
+        assert response.status_code == 200
+
+    def test_api_mate_status(self, client):
+        response = client.get("/api/mate/status")
+        assert response.status_code == 200
+
+    def test_api_mate_trinken(self, client):
+        response = client.post("/api/mate/trinken")
+        assert response.status_code == 200
diff --git a/tests/test_music.py b/tests/test_music.py
new file mode 100644
index 0000000..135741e
--- /dev/null
+++ b/tests/test_music.py
@@ -0,0 +1,18 @@
+from tests import client, app
+
+class TestMusic:
+    def test_api_music(self, client):
+        response = client.get("/api/music")
+        assert response.status_code == 200
+
+    def test_api_music_skip(self, client):
+        response = client.post("/api/music/skip")
+        assert response.status_code == 200
+
+    def test_api_music_queue(self, client):
+        response = client.get("/api/music/queue")
+        assert response.status_code == 200
+
+    def test_api_music_add_song(self, client):
+        response = client.post("/api/music/add_song")
+        assert response.status_code == 200
diff --git a/tests/test_party.py b/tests/test_party.py
index 493e577..24905f5 100644
--- a/tests/test_party.py
+++ b/tests/test_party.py
@@ -9,46 +9,3 @@ class TestServer:
         response = client.get("/api")
         assert response.status_code == 200
 
-    def test_api_mate(self, client):
-        response = client.get("/api/mate")
-        assert response.status_code == 200
-
-    def test_api_mate_status(self, client):
-        response = client.get("/api/mate/status")
-        assert response.status_code == 200
-
-    def test_api_mate_trinken(self, client):
-        response = client.post("/api/mate/trinken")
-        assert response.status_code == 200
-
-    def test_api_chat(self, client):
-        response = client.get("/api/chat/")
-        assert response.status_code == 200
-
-    def test_api_chat_messages_1(self, client):
-        response = client.get("/api/chat/messages/1")
-        assert response.status_code == 200
-
-    def test_api_chat_messages_2(self, client):
-        response = client.get("/api/chat/messages/1/1")
-        assert response.status_code == 200
-
-    def test_api_chat_new_message(self, client):
-        response = client.post("/api/chat/new_message")
-        assert response.status_code == 200
-
-    def test_api_music(self, client):
-        response = client.get("/api/music")
-        assert response.status_code == 200
-
-    def test_api_music_skip(self, client):
-        response = client.post("/api/music/skip")
-        assert response.status_code == 200
-
-    def test_api_music_queue(self, client):
-        response = client.get("/api/music/queue")
-        assert response.status_code == 200
-
-    def test_api_music_add_song(self, client):
-        response = client.post("/api/music/add_song")
-        assert response.status_code == 200