diff --git a/mayan/apps/folders/tests/test_api.py b/mayan/apps/folders/tests/test_api.py
index 1e7180b1fb..333198a4d5 100644
--- a/mayan/apps/folders/tests/test_api.py
+++ b/mayan/apps/folders/tests/test_api.py
@@ -37,11 +37,11 @@ class FolderAPITestCase(APITestCase):
             reverse('rest_api:folder-list'), {'label': TEST_FOLDER_LABEL}
         )
 
-        self.assertEqual(response.data['id'], 1)
-        self.assertEqual(response.data['label'], TEST_FOLDER_LABEL)
-
         folder = Folder.objects.first()
 
+        self.assertEqual(response.data['id'], folder.pk)
+        self.assertEqual(response.data['label'], TEST_FOLDER_LABEL)
+
         self.assertEqual(Folder.objects.count(), 1)
         self.assertEqual(folder.label, TEST_FOLDER_LABEL)
 
diff --git a/mayan/apps/tags/tests/test_api.py b/mayan/apps/tags/tests/test_api.py
index ca0950918c..d714a5a14f 100644
--- a/mayan/apps/tags/tests/test_api.py
+++ b/mayan/apps/tags/tests/test_api.py
@@ -45,12 +45,12 @@ class TagAPITestCase(APITestCase):
             }
         )
 
-        self.assertEqual(response.data['id'], 1)
+        tag = Tag.objects.first()
+
+        self.assertEqual(response.data['id'], tag.pk)
         self.assertEqual(response.data['label'], TEST_TAG_LABEL)
         self.assertEqual(response.data['color'], TEST_TAG_COLOR)
 
-        tag = Tag.objects.first()
-
         self.assertEqual(Tag.objects.count(), 1)
         self.assertEqual(tag.label, TEST_TAG_LABEL)
         self.assertEqual(tag.color, TEST_TAG_COLOR)