diff --git a/netbox/utilities/testing/utils.py b/netbox/utilities/testing/utils.py
index 7ff45a30d..6d20d4fff 100644
--- a/netbox/utilities/testing/utils.py
+++ b/netbox/utilities/testing/utils.py
@@ -22,13 +22,14 @@ def model_to_dict(instance, fields=None, exclude=None):
         if key.startswith('_'):
             del model_dict[key]
 
+        # TODO: Differentiate between tags assigned to the instance and a M2M field for tags (ex: ConfigContext)
+        elif key == 'tags':
+            model_dict[key] = ','.join(sorted([tag.name for tag in model_dict['tags']]))
+
         # Convert ManyToManyField to list of instance PKs
         elif model_dict[key] and type(model_dict[key]) in (list, tuple) and hasattr(model_dict[key][0], 'pk'):
             model_dict[key] = [obj.pk for obj in model_dict[key]]
 
-    if 'tags' in model_dict:
-        model_dict['tags'] = ','.join(sorted([tag.name for tag in model_dict['tags']]))
-
     return model_dict