diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py
index d10d2df85..6ecc88e5c 100644
--- a/netbox/circuits/tests/test_views.py
+++ b/netbox/circuits/tests/test_views.py
@@ -13,7 +13,6 @@ class ProviderTestCase(TestCase):
 
     @classmethod
     def setUpTestData(cls):
-
         Provider.objects.bulk_create([
             Provider(name='Provider 1', slug='provider-1', asn=65001),
             Provider(name='Provider 2', slug='provider-2', asn=65002),
@@ -21,24 +20,21 @@ class ProviderTestCase(TestCase):
         ])
 
     def test_provider_list(self):
-
         url = reverse('circuits:provider_list')
         params = {
             "q": "test",
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_provider(self):
-
         provider = Provider.objects.first()
         response = self.client.get(provider.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_provider_import(self):
         self.add_permissions('circuits.add_provider')
-
         csv_data = (
             "name,slug",
             "Provider 4,provider-4",
@@ -48,7 +44,7 @@ class ProviderTestCase(TestCase):
 
         response = self.client.post(reverse('circuits:provider_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Provider.objects.count(), 6)
 
 
@@ -71,7 +67,7 @@ class CircuitTypeTestCase(TestCase):
         url = reverse('circuits:circuittype_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_circuittype_import(self):
         self.add_permissions('circuits.add_circuittype')
@@ -85,7 +81,7 @@ class CircuitTypeTestCase(TestCase):
 
         response = self.client.post(reverse('circuits:circuittype_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(CircuitType.objects.count(), 6)
 
 
@@ -118,13 +114,13 @@ class CircuitTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_circuit(self):
 
         circuit = Circuit.objects.first()
         response = self.client.get(circuit.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_circuit_import(self):
         self.add_permissions('circuits.add_circuit')
@@ -138,5 +134,5 @@ class CircuitTestCase(TestCase):
 
         response = self.client.post(reverse('circuits:circuit_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Circuit.objects.count(), 6)
diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py
index 45887f171..6a07e0153 100644
--- a/netbox/dcim/tests/test_views.py
+++ b/netbox/dcim/tests/test_views.py
@@ -27,7 +27,7 @@ class RegionTestCase(TestCase):
         url = reverse('dcim:region_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_region_import(self):
         self.add_permissions('dcim.add_region')
@@ -41,7 +41,7 @@ class RegionTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:region_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Region.objects.count(), 6)
 
 
@@ -70,13 +70,13 @@ class SiteTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_site(self):
 
         site = Site.objects.first()
         response = self.client.get(site.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_site_import(self):
         self.add_permissions('dcim.add_site')
@@ -90,7 +90,7 @@ class SiteTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:site_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Site.objects.count(), 6)
 
 
@@ -116,7 +116,7 @@ class RackGroupTestCase(TestCase):
         url = reverse('dcim:rackgroup_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_rackgroup_import(self):
         self.add_permissions('dcim.add_rackgroup')
@@ -130,7 +130,7 @@ class RackGroupTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:rackgroup_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(RackGroup.objects.count(), 6)
 
 
@@ -153,7 +153,7 @@ class RackRoleTestCase(TestCase):
         url = reverse('dcim:rackrole_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_rackrole_import(self):
         self.add_permissions('dcim.add_rackrole')
@@ -167,7 +167,7 @@ class RackRoleTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:rackrole_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(RackRole.objects.count(), 6)
 
 
@@ -198,7 +198,7 @@ class RackReservationTestCase(TestCase):
         url = reverse('dcim:rackreservation_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
 
 class RackTestCase(TestCase):
@@ -226,13 +226,13 @@ class RackTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_rack(self):
 
         rack = Rack.objects.first()
         response = self.client.get(rack.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_rack_import(self):
         self.add_permissions('dcim.add_rack')
@@ -246,7 +246,7 @@ class RackTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:rack_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Rack.objects.count(), 6)
 
 
@@ -269,7 +269,7 @@ class ManufacturerTypeTestCase(TestCase):
         url = reverse('dcim:manufacturer_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_manufacturer_import(self):
         self.add_permissions('dcim.add_manufacturer')
@@ -283,7 +283,7 @@ class ManufacturerTypeTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:manufacturer_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Manufacturer.objects.count(), 6)
 
 
@@ -312,14 +312,14 @@ class DeviceTypeTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_devicetype_export(self):
 
         url = reverse('dcim:devicetype_list')
 
         response = self.client.get('{}?export'.format(url))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         data = list(yaml.load_all(response.content, Loader=yaml.SafeLoader))
         self.assertEqual(len(data), 3)
         self.assertEqual(data[0]['manufacturer'], 'Manufacturer 1')
@@ -329,7 +329,7 @@ class DeviceTypeTestCase(TestCase):
 
         devicetype = DeviceType.objects.first()
         response = self.client.get(devicetype.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_devicetype_import(self):
 
@@ -424,7 +424,7 @@ device-bays:
             'format': 'yaml'
         }
         response = self.client.post(reverse('dcim:devicetype_import'), data=form_data, follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
         dt = DeviceType.objects.get(model='TEST-1000')
 
@@ -491,7 +491,7 @@ class DeviceRoleTestCase(TestCase):
         url = reverse('dcim:devicerole_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_devicerole_import(self):
         self.add_permissions('dcim.add_devicerole')
@@ -505,7 +505,7 @@ class DeviceRoleTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:devicerole_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(DeviceRole.objects.count(), 6)
 
 
@@ -528,7 +528,7 @@ class PlatformTestCase(TestCase):
         url = reverse('dcim:platform_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_platform_import(self):
         self.add_permissions('dcim.add_platform')
@@ -542,7 +542,7 @@ class PlatformTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:platform_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Platform.objects.count(), 6)
 
 
@@ -581,13 +581,13 @@ class DeviceTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_device(self):
 
         device = Device.objects.first()
         response = self.client.get(device.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_device_import(self):
         self.add_permissions('dcim.add_device')
@@ -601,7 +601,7 @@ class DeviceTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:device_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Device.objects.count(), 6)
 
 
@@ -639,7 +639,7 @@ class ConsolePortTestCase(TestCase):
         url = reverse('dcim:consoleport_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_consoleport_import(self):
         self.add_permissions('dcim.add_consoleport')
@@ -653,7 +653,7 @@ class ConsolePortTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:consoleport_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(ConsolePort.objects.count(), 6)
 
 
@@ -691,7 +691,7 @@ class ConsoleServerPortTestCase(TestCase):
         url = reverse('dcim:consoleserverport_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_consoleserverport_import(self):
         self.add_permissions('dcim.add_consoleserverport')
@@ -705,7 +705,7 @@ class ConsoleServerPortTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:consoleserverport_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(ConsoleServerPort.objects.count(), 6)
 
 
@@ -743,7 +743,7 @@ class PowerPortTestCase(TestCase):
         url = reverse('dcim:powerport_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_powerport_import(self):
         self.add_permissions('dcim.add_powerport')
@@ -757,7 +757,7 @@ class PowerPortTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:powerport_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(PowerPort.objects.count(), 6)
 
 
@@ -795,7 +795,7 @@ class PowerOutletTestCase(TestCase):
         url = reverse('dcim:poweroutlet_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_poweroutlet_import(self):
         self.add_permissions('dcim.add_poweroutlet')
@@ -809,7 +809,7 @@ class PowerOutletTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:poweroutlet_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(PowerOutlet.objects.count(), 6)
 
 
@@ -847,7 +847,7 @@ class InterfaceTestCase(TestCase):
         url = reverse('dcim:interface_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_interface_import(self):
         self.add_permissions('dcim.add_interface')
@@ -861,7 +861,7 @@ class InterfaceTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:interface_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Interface.objects.count(), 6)
 
 
@@ -911,7 +911,7 @@ class FrontPortTestCase(TestCase):
         url = reverse('dcim:frontport_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_frontport_import(self):
         self.add_permissions('dcim.add_frontport')
@@ -925,7 +925,7 @@ class FrontPortTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:frontport_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(FrontPort.objects.count(), 6)
 
 
@@ -963,7 +963,7 @@ class RearPortTestCase(TestCase):
         url = reverse('dcim:rearport_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_rearport_import(self):
         self.add_permissions('dcim.add_rearport')
@@ -977,7 +977,7 @@ class RearPortTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:rearport_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(RearPort.objects.count(), 6)
 
 
@@ -1019,7 +1019,7 @@ class DeviceBayTestCase(TestCase):
         url = reverse('dcim:devicebay_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_devicebay_import(self):
         self.add_permissions('dcim.add_devicebay')
@@ -1033,7 +1033,7 @@ class DeviceBayTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:devicebay_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(DeviceBay.objects.count(), 6)
 
 
@@ -1074,7 +1074,7 @@ class InventoryItemTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_inventoryitem_import(self):
         self.add_permissions('dcim.add_inventoryitem')
@@ -1088,7 +1088,7 @@ class InventoryItemTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:inventoryitem_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(InventoryItem.objects.count(), 6)
 
 
@@ -1154,13 +1154,13 @@ class CableTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_cable(self):
 
         cable = Cable.objects.first()
         response = self.client.get(cable.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_cable_import(self):
         self.add_permissions('dcim.add_cable')
@@ -1174,7 +1174,7 @@ class CableTestCase(TestCase):
 
         response = self.client.post(reverse('dcim:cable_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Cable.objects.count(), 6)
 
 
@@ -1228,4 +1228,4 @@ class VirtualChassisTestCase(TestCase):
         url = reverse('dcim:virtualchassis_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py
index 66742e1a9..1ea5f2e2b 100644
--- a/netbox/ipam/tests/test_views.py
+++ b/netbox/ipam/tests/test_views.py
@@ -31,13 +31,13 @@ class VRFTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_vrf(self):
 
         vrf = VRF.objects.first()
         response = self.client.get(vrf.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_vrf_import(self):
         self.add_permissions('ipam.add_vrf')
@@ -51,7 +51,7 @@ class VRFTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:vrf_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(VRF.objects.count(), 6)
 
 
@@ -74,7 +74,7 @@ class RIRTestCase(TestCase):
         url = reverse('ipam:rir_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_rir_import(self):
         self.add_permissions('ipam.add_rir')
@@ -88,7 +88,7 @@ class RIRTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:rir_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(RIR.objects.count(), 6)
 
 
@@ -117,13 +117,13 @@ class AggregateTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_aggregate(self):
 
         aggregate = Aggregate.objects.first()
         response = self.client.get(aggregate.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_aggregate_import(self):
         self.add_permissions('ipam.add_aggregate')
@@ -137,7 +137,7 @@ class AggregateTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:aggregate_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Aggregate.objects.count(), 6)
 
 
@@ -160,7 +160,7 @@ class RoleTestCase(TestCase):
         url = reverse('ipam:role_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_role_import(self):
         self.add_permissions('ipam.add_role')
@@ -174,7 +174,7 @@ class RoleTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:role_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Role.objects.count(), 6)
 
 
@@ -203,13 +203,13 @@ class PrefixTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_prefix(self):
 
         prefix = Prefix.objects.first()
         response = self.client.get(prefix.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_prefix_import(self):
         self.add_permissions('ipam.add_prefix')
@@ -223,7 +223,7 @@ class PrefixTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:prefix_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Prefix.objects.count(), 6)
 
 
@@ -252,13 +252,13 @@ class IPAddressTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_ipaddress(self):
 
         ipaddress = IPAddress.objects.first()
         response = self.client.get(ipaddress.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_ipaddress_import(self):
         self.add_permissions('ipam.add_ipaddress')
@@ -272,7 +272,7 @@ class IPAddressTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:ipaddress_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(IPAddress.objects.count(), 6)
 
 
@@ -301,7 +301,7 @@ class VLANGroupTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_vlangroup_import(self):
         self.add_permissions('ipam.add_vlangroup')
@@ -315,7 +315,7 @@ class VLANGroupTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:vlangroup_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(VLANGroup.objects.count(), 6)
 
 
@@ -344,13 +344,13 @@ class VLANTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_vlan(self):
 
         vlan = VLAN.objects.first()
         response = self.client.get(vlan.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_vlan_import(self):
         self.add_permissions('ipam.add_vlan')
@@ -364,7 +364,7 @@ class VLANTestCase(TestCase):
 
         response = self.client.post(reverse('ipam:vlan_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(VLAN.objects.count(), 6)
 
 
@@ -405,10 +405,10 @@ class ServiceTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_service(self):
 
         service = Service.objects.first()
         response = self.client.get(service.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
diff --git a/netbox/netbox/tests/test_views.py b/netbox/netbox/tests/test_views.py
index db84dcd1a..1942471b0 100644
--- a/netbox/netbox/tests/test_views.py
+++ b/netbox/netbox/tests/test_views.py
@@ -1,6 +1,6 @@
 import urllib.parse
 
-from django.test import TestCase
+from utilities.testing import TestCase
 from django.urls import reverse
 
 
@@ -11,7 +11,7 @@ class HomeViewTestCase(TestCase):
         url = reverse('home')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_search(self):
 
@@ -21,4 +21,4 @@ class HomeViewTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
diff --git a/netbox/secrets/tests/test_views.py b/netbox/secrets/tests/test_views.py
index 14074630b..336a33320 100644
--- a/netbox/secrets/tests/test_views.py
+++ b/netbox/secrets/tests/test_views.py
@@ -28,7 +28,7 @@ class SecretRoleTestCase(TestCase):
         url = reverse('secrets:secretrole_list')
 
         response = self.client.get(url, follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_secretrole_import(self):
         self.add_permissions('secrets.add_secretrole')
@@ -42,7 +42,7 @@ class SecretRoleTestCase(TestCase):
 
         response = self.client.post(reverse('secrets:secretrole_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(SecretRole.objects.count(), 6)
 
 
@@ -97,13 +97,13 @@ class SecretTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)), follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_secret(self):
 
         secret = Secret.objects.first()
         response = self.client.get(secret.get_absolute_url(), follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_secret_import(self):
         self.add_permissions('secrets.add_secret')
@@ -121,5 +121,5 @@ class SecretTestCase(TestCase):
 
         response = self.client.post(reverse('secrets:secret_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Secret.objects.count(), 6)
diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py
index 3cb04d6b2..8646abe38 100644
--- a/netbox/tenancy/tests/test_views.py
+++ b/netbox/tenancy/tests/test_views.py
@@ -25,7 +25,7 @@ class TenantGroupTestCase(TestCase):
         url = reverse('tenancy:tenantgroup_list')
 
         response = self.client.get(url, follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_tenantgroup_import(self):
         self.add_permissions('tenancy.add_tenantgroup')
@@ -39,7 +39,7 @@ class TenantGroupTestCase(TestCase):
 
         response = self.client.post(reverse('tenancy:tenantgroup_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(TenantGroup.objects.count(), 6)
 
 
@@ -68,13 +68,13 @@ class TenantTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)), follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_tenant(self):
 
         tenant = Tenant.objects.first()
         response = self.client.get(tenant.get_absolute_url(), follow=True)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_tenant_import(self):
         self.add_permissions('tenancy.add_tenant')
@@ -88,5 +88,5 @@ class TenantTestCase(TestCase):
 
         response = self.client.post(reverse('tenancy:tenant_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Tenant.objects.count(), 6)
diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py
index 67df8fe1e..df346d11e 100644
--- a/netbox/virtualization/tests/test_views.py
+++ b/netbox/virtualization/tests/test_views.py
@@ -25,7 +25,7 @@ class ClusterGroupTestCase(TestCase):
         url = reverse('virtualization:clustergroup_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_clustergroup_import(self):
         self.add_permissions('virtualization.add_clustergroup')
@@ -39,7 +39,7 @@ class ClusterGroupTestCase(TestCase):
 
         response = self.client.post(reverse('virtualization:clustergroup_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(ClusterGroup.objects.count(), 6)
 
 
@@ -62,7 +62,7 @@ class ClusterTypeTestCase(TestCase):
         url = reverse('virtualization:clustertype_list')
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_clustertype_import(self):
         self.add_permissions('virtualization.add_clustertype')
@@ -76,7 +76,7 @@ class ClusterTypeTestCase(TestCase):
 
         response = self.client.post(reverse('virtualization:clustertype_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(ClusterType.objects.count(), 6)
 
 
@@ -109,13 +109,13 @@ class ClusterTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_cluster(self):
 
         cluster = Cluster.objects.first()
         response = self.client.get(cluster.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_cluster_import(self):
         self.add_permissions('virtualization.add_cluster')
@@ -129,7 +129,7 @@ class ClusterTestCase(TestCase):
 
         response = self.client.post(reverse('virtualization:cluster_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(Cluster.objects.count(), 6)
 
 
@@ -161,13 +161,13 @@ class VirtualMachineTestCase(TestCase):
         }
 
         response = self.client.get('{}?{}'.format(url, urllib.parse.urlencode(params)))
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_virtualmachine(self):
 
         virtualmachine = VirtualMachine.objects.first()
         response = self.client.get(virtualmachine.get_absolute_url())
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
 
     def test_virtualmachine_import(self):
         self.add_permissions('virtualization.add_virtualmachine')
@@ -181,5 +181,5 @@ class VirtualMachineTestCase(TestCase):
 
         response = self.client.post(reverse('virtualization:virtualmachine_import'), {'csv': '\n'.join(csv_data)})
 
-        self.assertEqual(response.status_code, 200)
+        self.assertHttpStatus(response, 200)
         self.assertEqual(VirtualMachine.objects.count(), 6)