diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py
index 7f68e7814..cd456d86c 100644
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -47,6 +47,9 @@ class ProviderTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(Provider.objects.count(), 4)
+        provider4 = Provider.objects.get(pk=response.data['id'])
+        self.assertEqual(provider4.name, data['name'])
+        self.assertEqual(provider4.slug, data['slug'])
 
     def test_update_provider(self):
 
@@ -60,8 +63,9 @@ class ProviderTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(Provider.objects.count(), 3)
-        self.assertEqual(Provider.objects.get(pk=self.provider1.pk).name, data['name'])
-        self.assertEqual(Provider.objects.get(pk=self.provider1.pk).slug, data['slug'])
+        provider1 = Provider.objects.get(pk=response.data['id'])
+        self.assertEqual(provider1.name, data['name'])
+        self.assertEqual(provider1.slug, data['slug'])
 
     def test_delete_provider(self):
 
@@ -110,6 +114,9 @@ class CircuitTypeTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(CircuitType.objects.count(), 4)
+        circuittype4 = CircuitType.objects.get(pk=response.data['id'])
+        self.assertEqual(circuittype4.name, data['name'])
+        self.assertEqual(circuittype4.slug, data['slug'])
 
     def test_update_circuittype(self):
 
@@ -123,8 +130,9 @@ class CircuitTypeTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(CircuitType.objects.count(), 3)
-        self.assertEqual(CircuitType.objects.get(pk=self.circuittype1.pk).name, data['name'])
-        self.assertEqual(CircuitType.objects.get(pk=self.circuittype1.pk).slug, data['slug'])
+        circuittype1 = CircuitType.objects.get(pk=response.data['id'])
+        self.assertEqual(circuittype1.name, data['name'])
+        self.assertEqual(circuittype1.slug, data['slug'])
 
     def test_delete_circuittype(self):
 
@@ -178,6 +186,10 @@ class CircuitTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(Circuit.objects.count(), 4)
+        circuit4 = Circuit.objects.get(pk=response.data['id'])
+        self.assertEqual(circuit4.cid, data['cid'])
+        self.assertEqual(circuit4.provider_id, data['provider'])
+        self.assertEqual(circuit4.type_id, data['type'])
 
     def test_update_circuit(self):
 
@@ -192,9 +204,10 @@ class CircuitTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(Circuit.objects.count(), 3)
-        self.assertEqual(Circuit.objects.get(pk=self.circuit1.pk).cid, data['cid'])
-        self.assertEqual(Circuit.objects.get(pk=self.circuit1.pk).provider_id, data['provider'])
-        self.assertEqual(Circuit.objects.get(pk=self.circuit1.pk).type_id, data['type'])
+        circuit1 = Circuit.objects.get(pk=response.data['id'])
+        self.assertEqual(circuit1.cid, data['cid'])
+        self.assertEqual(circuit1.provider_id, data['provider'])
+        self.assertEqual(circuit1.type_id, data['type'])
 
     def test_delete_circuit(self):
 
@@ -258,6 +271,11 @@ class CircuitTerminationTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(CircuitTermination.objects.count(), 4)
+        circuittermination4 = CircuitTermination.objects.get(pk=response.data['id'])
+        self.assertEqual(circuittermination4.circuit_id, data['circuit'])
+        self.assertEqual(circuittermination4.term_side, data['term_side'])
+        self.assertEqual(circuittermination4.site_id, data['site'])
+        self.assertEqual(circuittermination4.port_speed, data['port_speed'])
 
     def test_update_circuittermination(self):
 
@@ -273,8 +291,11 @@ class CircuitTerminationTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(CircuitTermination.objects.count(), 3)
-        self.assertEqual(CircuitTermination.objects.get(pk=self.circuittermination1.pk).site_id, data['site'])
-        self.assertEqual(CircuitTermination.objects.get(pk=self.circuittermination1.pk).term_side, data['term_side'])
+        circuittermination1 = CircuitTermination.objects.get(pk=response.data['id'])
+        self.assertEqual(circuittermination1.circuit_id, data['circuit'])
+        self.assertEqual(circuittermination1.term_side, data['term_side'])
+        self.assertEqual(circuittermination1.site_id, data['site'])
+        self.assertEqual(circuittermination1.port_speed, data['port_speed'])
 
     def test_delete_circuittermination(self):
 
diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py
index fb630caee..9d0f925c0 100644
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -46,6 +46,9 @@ class TenantGroupTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(TenantGroup.objects.count(), 4)
+        tenantgroup4 = TenantGroup.objects.get(pk=response.data['id'])
+        self.assertEqual(tenantgroup4.name, data['name'])
+        self.assertEqual(tenantgroup4.slug, data['slug'])
 
     def test_update_tenantgroup(self):
 
@@ -59,8 +62,9 @@ class TenantGroupTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(TenantGroup.objects.count(), 3)
-        self.assertEqual(TenantGroup.objects.get(pk=self.tenantgroup1.pk).name, data['name'])
-        self.assertEqual(TenantGroup.objects.get(pk=self.tenantgroup1.pk).slug, data['slug'])
+        tenantgroup1 = TenantGroup.objects.get(pk=response.data['id'])
+        self.assertEqual(tenantgroup1.name, data['name'])
+        self.assertEqual(tenantgroup1.slug, data['slug'])
 
     def test_delete_tenantgroup(self):
 
@@ -79,9 +83,11 @@ class TenantTest(APITestCase):
         token = Token.objects.create(user=user)
         self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(token.key)}
 
-        self.tenant1 = Tenant.objects.create(name='Test Tenant 1', slug='test-tenant-1')
-        self.tenant2 = Tenant.objects.create(name='Test Tenant 2', slug='test-tenant-2')
-        self.tenant3 = Tenant.objects.create(name='Test Tenant 3', slug='test-tenant-3')
+        self.tenantgroup1 = TenantGroup.objects.create(name='Test Tenant Group 1', slug='test-tenant-group-1')
+        self.tenantgroup2 = TenantGroup.objects.create(name='Test Tenant Group 2', slug='test-tenant-group-2')
+        self.tenant1 = Tenant.objects.create(name='Test Tenant 1', slug='test-tenant-1', group=self.tenantgroup1)
+        self.tenant2 = Tenant.objects.create(name='Test Tenant 2', slug='test-tenant-2', group=self.tenantgroup1)
+        self.tenant3 = Tenant.objects.create(name='Test Tenant 3', slug='test-tenant-3', group=self.tenantgroup1)
 
     def test_get_tenant(self):
 
@@ -102,6 +108,7 @@ class TenantTest(APITestCase):
         data = {
             'name': 'Test Tenant 4',
             'slug': 'test-tenant-4',
+            'group': self.tenantgroup1.pk,
         }
 
         url = reverse('tenancy-api:tenant-list')
@@ -109,12 +116,17 @@ class TenantTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(Tenant.objects.count(), 4)
+        tenant4 = Tenant.objects.get(pk=response.data['id'])
+        self.assertEqual(tenant4.name, data['name'])
+        self.assertEqual(tenant4.slug, data['slug'])
+        self.assertEqual(tenant4.group_id, data['group'])
 
     def test_update_tenant(self):
 
         data = {
             'name': 'Test Tenant X',
             'slug': 'test-tenant-x',
+            'group': self.tenantgroup2.pk,
         }
 
         url = reverse('tenancy-api:tenant-detail', kwargs={'pk': self.tenant1.pk})
@@ -122,8 +134,10 @@ class TenantTest(APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(Tenant.objects.count(), 3)
-        self.assertEqual(Tenant.objects.get(pk=self.tenant1.pk).name, data['name'])
-        self.assertEqual(Tenant.objects.get(pk=self.tenant1.pk).slug, data['slug'])
+        tenant1 = Tenant.objects.get(pk=response.data['id'])
+        self.assertEqual(tenant1.name, data['name'])
+        self.assertEqual(tenant1.slug, data['slug'])
+        self.assertEqual(tenant1.group_id, data['group'])
 
     def test_delete_tenant(self):