diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py
index f554404f3c..2902325804 100644
--- a/bookwyrm/tests/views/shelf/test_shelf_actions.py
+++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py
@@ -74,7 +74,7 @@ def test_shelve(self, *_):
 
     def test_shelve_to_read(self, *_):
         """special behavior for the to-read shelf"""
-        shelf = models.Shelf.objects.get(identifier="to-read")
+        shelf = models.Shelf.objects.get(user=self.local_user, identifier="to-read")
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": shelf.identifier}
         )
@@ -87,7 +87,7 @@ def test_shelve_to_read(self, *_):
 
     def test_shelve_reading(self, *_):
         """special behavior for the reading shelf"""
-        shelf = models.Shelf.objects.get(identifier="reading")
+        shelf = models.Shelf.objects.get(user=self.local_user, identifier="reading")
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": shelf.identifier}
         )
@@ -100,7 +100,7 @@ def test_shelve_reading(self, *_):
 
     def test_shelve_read(self, *_):
         """special behavior for the read shelf"""
-        shelf = models.Shelf.objects.get(identifier="read")
+        shelf = models.Shelf.objects.get(user=self.local_user, identifier="read")
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": shelf.identifier}
         )
@@ -113,11 +113,13 @@ def test_shelve_read(self, *_):
 
     def test_shelve_read_with_change_shelf(self, *_):
         """special behavior for the read shelf"""
-        previous_shelf = models.Shelf.objects.get(identifier="reading")
+        previous_shelf = models.Shelf.objects.get(
+            user=self.local_user, identifier="reading"
+        )
         models.ShelfBook.objects.create(
             shelf=previous_shelf, user=self.local_user, book=self.book
         )
-        shelf = models.Shelf.objects.get(identifier="read")
+        shelf = models.Shelf.objects.get(user=self.local_user, identifier="read")
 
         request = self.factory.post(
             "",
@@ -168,7 +170,7 @@ def test_create_shelf(self, *_):
 
         views.create_shelf(request)
 
-        shelf = models.Shelf.objects.get(name="new shelf name")
+        shelf = models.Shelf.objects.get(user=self.local_user, name="new shelf name")
         self.assertEqual(shelf.privacy, "unlisted")
         self.assertEqual(shelf.description, "desc")
         self.assertEqual(shelf.user, self.local_user)
@@ -198,18 +200,8 @@ def test_delete_shelf(self, *_):
 
     def test_delete_shelf_unauthorized(self, *_):
         """delete a brand new custom shelf"""
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
-            "bookwyrm.activitystreams.populate_stream_task.delay"
-        ), patch("bookwyrm.lists_stream.populate_lists_task.delay"):
-            rat = models.User.objects.create_user(
-                "rat@local.com",
-                "rat@mouse.mouse",
-                "password",
-                local=True,
-                localname="rat",
-            )
         request = self.factory.post("")
-        request.user = rat
+        request.user = self.another_user
 
         with self.assertRaises(PermissionDenied):
             views.delete_shelf(request, self.shelf.id)