diff --git a/tests/oidc/conftest.py b/tests/oidc/conftest.py
index ffbeb92f..5ff9ad51 100644
--- a/tests/oidc/conftest.py
+++ b/tests/oidc/conftest.py
@@ -44,10 +44,7 @@ def client(testclient, other_client, slapd_connection):
     c.save()
 
     yield c
-    try:
-        c.delete()
-    except:
-        pass
+    c.delete()
 
 
 @pytest.fixture
@@ -83,10 +80,7 @@ def other_client(testclient, slapd_connection):
     c.save()
 
     yield c
-    try:
-        c.delete()
-    except:
-        pass
+    c.delete()
 
 
 @pytest.fixture
@@ -108,10 +102,7 @@ def authorization(testclient, user, client, slapd_connection):
     )
     a.save()
     yield a
-    try:
-        a.delete()
-    except:
-        pass
+    a.delete()
 
 
 @pytest.fixture
@@ -130,10 +121,7 @@ def token(testclient, client, user, slapd_connection):
     )
     t.save()
     yield t
-    try:
-        t.delete()
-    except:
-        pass
+    t.delete()
 
 
 @pytest.fixture
@@ -156,7 +144,4 @@ def consent(testclient, client, user, slapd_connection):
     )
     t.save()
     yield t
-    try:
-        t.delete()
-    except:
-        pass
+    t.delete()
diff --git a/tests/oidc/test_client_admin.py b/tests/oidc/test_client_admin.py
index 0fd2bd92..231b125a 100644
--- a/tests/oidc/test_client_admin.py
+++ b/tests/oidc/test_client_admin.py
@@ -59,6 +59,7 @@ def test_client_add(testclient, logged_admin):
             assert [v] == client_value
         else:
             assert v == client_value
+    client.delete()
 
 
 def test_client_edit(testclient, client, logged_admin, other_client):
@@ -106,11 +107,6 @@ def test_client_edit(testclient, client, logged_admin, other_client):
         else:
             assert v == client_value
 
-    res.forms["clientadd"].submit(status=302, name="action", value="delete").follow(
-        status=200
-    )
-    assert Client.get(client.client_id) is None
-
 
 def test_client_edit_preauth(testclient, client, logged_admin, other_client):
     assert not client.preconsent