diff --git a/api/funkwhale_api/favorites/tests/test_favorites.py b/api/funkwhale_api/favorites/tests/test_favorites.py
index 230f030fe6b84f7f5dc3fd298e48cc8b0cd6ffb2..78c64a41338607a11830a8fdb64df758d9214ab6 100644
--- a/api/funkwhale_api/favorites/tests/test_favorites.py
+++ b/api/funkwhale_api/favorites/tests/test_favorites.py
@@ -1,6 +1,6 @@
 import json
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from funkwhale_api.music.models import Track, Artist
 from funkwhale_api.favorites.models import TrackFavorite
diff --git a/api/funkwhale_api/history/tests/test_history.py b/api/funkwhale_api/history/tests/test_history.py
index a5b771f09ae64492a4309fd9a86863d59f824fef..5cb45c946d092d8e0d58d357397581b117bb616f 100644
--- a/api/funkwhale_api/history/tests/test_history.py
+++ b/api/funkwhale_api/history/tests/test_history.py
@@ -1,7 +1,7 @@
 import random
 import json
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index e5c87a601b8559b39b680308294bd1eb595274c8..b7cf0f25c82d8b6335b1fd30af7d96288f495de0 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -10,7 +10,7 @@ from django.conf import settings
 from django.db import models
 from django.core.files.base import ContentFile
 from django.core.files import File
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
 from taggit.managers import TaggableManager
 from versatileimagefield.fields import VersatileImageField
diff --git a/api/funkwhale_api/music/tests/test_api.py b/api/funkwhale_api/music/tests/test_api.py
index b7c25424f322605bc47662743d921e0419ed3d3e..2460fa97d0830a8b66ceaeef80f680def65b02cc 100644
--- a/api/funkwhale_api/music/tests/test_api.py
+++ b/api/funkwhale_api/music/tests/test_api.py
@@ -1,7 +1,7 @@
 import json
 import unittest
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from funkwhale_api.music import models
 from funkwhale_api.utils.tests import TMPDirTestCaseMixin
diff --git a/api/funkwhale_api/music/tests/test_lyrics.py b/api/funkwhale_api/music/tests/test_lyrics.py
index 7032e58087ff46eb3caa969a1c2c675b4343a817..9a05e5eb87b88752ea9aa81ac081a0e2981d9570 100644
--- a/api/funkwhale_api/music/tests/test_lyrics.py
+++ b/api/funkwhale_api/music/tests/test_lyrics.py
@@ -1,7 +1,7 @@
 import json
 import unittest
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from funkwhale_api.music import models
 from funkwhale_api.musicbrainz import api
diff --git a/api/funkwhale_api/music/tests/test_works.py b/api/funkwhale_api/music/tests/test_works.py
index b199c8c5b7d98f839296ba9e6f3c65a059ff98b1..55714bce2c142c36b86f52c9361292df79689695 100644
--- a/api/funkwhale_api/music/tests/test_works.py
+++ b/api/funkwhale_api/music/tests/test_works.py
@@ -1,7 +1,7 @@
 import json
 import unittest
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from funkwhale_api.music import models
 from funkwhale_api.musicbrainz import api
diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 1fd7aa974cb9a2ec8111f906bef4ec6d5d6d36dd..c32fa8f7ff49caa1ef9fbfff533e12a32835373e 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -2,7 +2,7 @@ import os
 import json
 import unicodedata
 import urllib
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models, transaction
 from django.db.models.functions import Length
 from django.conf import settings
diff --git a/api/funkwhale_api/musicbrainz/tests/test_api.py b/api/funkwhale_api/musicbrainz/tests/test_api.py
index f962e0f781e515716b808c7697fd0b63692cf174..b0911f1c54983fd0f41eda12027ea0c836d587a0 100644
--- a/api/funkwhale_api/musicbrainz/tests/test_api.py
+++ b/api/funkwhale_api/musicbrainz/tests/test_api.py
@@ -1,7 +1,7 @@
 import json
 import unittest
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from funkwhale_api.musicbrainz import api
 from . import data as api_data
diff --git a/api/funkwhale_api/playlists/tests/test_playlists.py b/api/funkwhale_api/playlists/tests/test_playlists.py
index 59054be2be4bbe51a0d3c99e5a9204f78d5b4aa6..2f61889ee13d5afbc949ba36a06e9b30b6dbfad7 100644
--- a/api/funkwhale_api/playlists/tests/test_playlists.py
+++ b/api/funkwhale_api/playlists/tests/test_playlists.py
@@ -1,6 +1,6 @@
 import json
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 
diff --git a/api/funkwhale_api/providers/youtube/tests/test_youtube.py b/api/funkwhale_api/providers/youtube/tests/test_youtube.py
index db6bd8413f24bc77035737c936591701f14dd80a..8a1dd1eb70a601e56082ec7dce8fe3cae32c7095 100644
--- a/api/funkwhale_api/providers/youtube/tests/test_youtube.py
+++ b/api/funkwhale_api/providers/youtube/tests/test_youtube.py
@@ -2,7 +2,7 @@ import json
 from collections import OrderedDict
 import unittest
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from funkwhale_api.providers.youtube.client import client
 
 from . import data as api_data
diff --git a/api/funkwhale_api/radios/tests/test_radios.py b/api/funkwhale_api/radios/tests/test_radios.py
index aec919ee0218d0163758165d5d040bd7db5ca85e..ab27d45166a343c3bb731608db750312b934d241 100644
--- a/api/funkwhale_api/radios/tests/test_radios.py
+++ b/api/funkwhale_api/radios/tests/test_radios.py
@@ -1,7 +1,7 @@
 import random
 import json
 from test_plus.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ValidationError
 
 
diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py
index c5ca896ab667e6e69f588dd4446643844003382e..c8d0b534c8b84706fcd050eee819e889e186f525 100644
--- a/api/funkwhale_api/users/models.py
+++ b/api/funkwhale_api/users/models.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals, absolute_import
 
 from django.contrib.auth.models import AbstractUser
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _