diff --git a/api/tests/playlists/test_models.py b/api/tests/playlists/test_models.py
new file mode 100644
index 0000000000000000000000000000000000000000..9ec2a4af88125739fc646261b8a4a342f1e43ef5
--- /dev/null
+++ b/api/tests/playlists/test_models.py
@@ -0,0 +1,20 @@
+
+
+def test_can_create_playlist(factories):
+    tracks = factories['music.Track'].create_batch(5)
+    playlist = factories['playlists.Playlist']()
+
+    previous = None
+    for track in tracks:
+        previous = playlist.add_track(track, previous=previous)
+
+    playlist_tracks = list(playlist.playlist_tracks.all())
+
+    previous = None
+    for idx, track in enumerate(tracks):
+        plt = playlist_tracks[idx]
+        assert plt.position == idx
+        assert plt.track == track
+        if previous:
+            assert playlist_tracks[idx + 1] == previous
+        assert plt.playlist == playlist
diff --git a/api/tests/test_playlists.py b/api/tests/playlists/test_views.py
similarity index 63%
rename from api/tests/test_playlists.py
rename to api/tests/playlists/test_views.py
index f496a64cb5d93a14aacc8bb73ddc2a58e3c7b50e..943de03e11728631b693312dba46d34d56016123 100644
--- a/api/tests/test_playlists.py
+++ b/api/tests/playlists/test_views.py
@@ -7,27 +7,6 @@ from funkwhale_api.playlists import models
 from funkwhale_api.playlists.serializers import PlaylistSerializer
 
 
-
-def test_can_create_playlist(factories):
-    tracks = factories['music.Track'].create_batch(5)
-    playlist = factories['playlists.Playlist']()
-
-    previous = None
-    for track in tracks:
-        previous = playlist.add_track(track, previous=previous)
-
-    playlist_tracks = list(playlist.playlist_tracks.all())
-
-    previous = None
-    for idx, track in enumerate(tracks):
-        plt = playlist_tracks[idx]
-        assert plt.position == idx
-        assert plt.track == track
-        if previous:
-            assert playlist_tracks[idx + 1] == previous
-        assert plt.playlist == playlist
-
-
 def test_can_create_playlist_via_api(logged_in_client):
     url = reverse('api:v1:playlists-list')
     data = {