diff --git a/tests/api2/test_user_admin.py b/tests/api2/test_user_admin.py
index 0654faed839c2..5a011621f1410 100644
--- a/tests/api2/test_user_admin.py
+++ b/tests/api2/test_user_admin.py
@@ -29,7 +29,8 @@ def admin():
         try:
             yield admin
         finally:
-            call("user.delete", admin["id"])
+            call("datastore.delete", "account.bsdusers", admin["id"])
+            call("etc.generate", "user")
 
 
 def test_installer_admin_has_local_administrator_privilege(admin):