diff --git a/test/common.py b/test/common.py
index 1f9ca58..bc1d480 100644
--- a/test/common.py
+++ b/test/common.py
@@ -42,13 +42,12 @@ def setUp(self) -> None:
 
         LOGGER.debug("Test: %s", self.id())
 
-        with self.api.sync_lock():
-            self.api.delete_all_notebooks()
-            self.api.delete_all_notes()
-            self.api.delete_all_resources()
-            self.api.delete_all_tags()
-            # Delete revisions last to cover all previous deletions.
-            self.api.delete_all_revisions()
+        self.api.delete_all_notebooks()
+        self.api.delete_all_notes()
+        self.api.delete_all_resources()
+        self.api.delete_all_tags()
+        # Delete revisions last to cover all previous deletions.
+        self.api.delete_all_revisions()
 
     @staticmethod
     def get_random_id() -> str:
diff --git a/test/test_server_api.py b/test/test_server_api.py
index bffea3f..434dab5 100644
--- a/test/test_server_api.py
+++ b/test/test_server_api.py
@@ -29,7 +29,8 @@ def tearDownModule():  # pylint: disable=invalid-name
 class ServerBase(common.Base):
     def setUp(self):
         self.api = cast(ServerApi, API)
-        super().setUp()
+        with self.api.sync_lock():  # needed for clearing all data
+            super().setUp()
 
         self.api._acquire_sync_lock()
         if self.api.current_sync_lock is None: