diff --git a/netbox/extras/tests/test_changelog.py b/netbox/extras/tests/test_changelog.py
index 33251473f..e0be8c3bd 100644
--- a/netbox/extras/tests/test_changelog.py
+++ b/netbox/extras/tests/test_changelog.py
@@ -73,7 +73,7 @@ class ChangeLogViewTest(ModelViewTestCase):
         site = Site(name='Site 1', slug='site-1')
         site.save()
         tags = create_tags('Tag 1', 'Tag 2', 'Tag 3')
-        site.tags.set('Tag 1', 'Tag 2')
+        site.tags.set(['Tag 1', 'Tag 2'])
 
         form_data = {
             'name': 'Site X',
@@ -117,7 +117,7 @@ class ChangeLogViewTest(ModelViewTestCase):
         )
         site.save()
         create_tags('Tag 1', 'Tag 2')
-        site.tags.set('Tag 1', 'Tag 2')
+        site.tags.set(['Tag 1', 'Tag 2'])
 
         request = {
             'path': self._get_url('delete', instance=site),
@@ -310,7 +310,7 @@ class ChangeLogAPITest(APITestCase):
             }
         )
         site.save()
-        site.tags.set(*Tag.objects.all()[:2])
+        site.tags.set(Tag.objects.all()[:2])
         self.assertEqual(ObjectChange.objects.count(), 0)
         self.add_permissions('dcim.delete_site')
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
diff --git a/netbox/extras/tests/test_filtersets.py b/netbox/extras/tests/test_filtersets.py
index 656c3efdc..0f4b35cf6 100644
--- a/netbox/extras/tests/test_filtersets.py
+++ b/netbox/extras/tests/test_filtersets.py
@@ -542,8 +542,8 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
         site = Site.objects.create(name='Site 1', slug='site-1')
         provider = Provider.objects.create(name='Provider 1', slug='provider-1')
 
-        site.tags.set(tags[0])
-        provider.tags.set(tags[1])
+        site.tags.set([tags[0]])
+        provider.tags.set([tags[1]])
 
     def test_name(self):
         params = {'name': ['Tag 1', 'Tag 2']}
diff --git a/netbox/extras/tests/test_webhooks.py b/netbox/extras/tests/test_webhooks.py
index 811260f92..111ec6353 100644
--- a/netbox/extras/tests/test_webhooks.py
+++ b/netbox/extras/tests/test_webhooks.py
@@ -123,7 +123,7 @@ class WebhookTest(APITestCase):
 
     def test_enqueue_webhook_update(self):
         site = Site.objects.create(name='Site 1', slug='site-1')
-        site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar']))
+        site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
 
         # Update an object via the REST API
         data = {
@@ -159,7 +159,7 @@ class WebhookTest(APITestCase):
         )
         Site.objects.bulk_create(sites)
         for site in sites:
-            site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar']))
+            site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
 
         # Update three objects via the REST API
         data = [
@@ -205,7 +205,7 @@ class WebhookTest(APITestCase):
 
     def test_enqueue_webhook_delete(self):
         site = Site.objects.create(name='Site 1', slug='site-1')
-        site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar']))
+        site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
 
         # Delete an object via the REST API
         url = reverse('dcim-api:site-detail', kwargs={'pk': site.pk})
@@ -231,7 +231,7 @@ class WebhookTest(APITestCase):
         )
         Site.objects.bulk_create(sites)
         for site in sites:
-            site.tags.set(*Tag.objects.filter(name__in=['Foo', 'Bar']))
+            site.tags.set(Tag.objects.filter(name__in=['Foo', 'Bar']))
 
         # Delete three objects via the REST API
         data = [
diff --git a/netbox/netbox/api/serializers.py b/netbox/netbox/api/serializers.py
index 9f51d475d..4c26dbada 100644
--- a/netbox/netbox/api/serializers.py
+++ b/netbox/netbox/api/serializers.py
@@ -175,7 +175,7 @@ class PrimaryModelSerializer(CustomFieldModelSerializer):
 
     def _save_tags(self, instance, tags):
         if tags:
-            instance.tags.set(*[t.name for t in tags])
+            instance.tags.set([t.name for t in tags])
         else:
             instance.tags.clear()