diff --git a/tests/test_boolean.py b/tests/test_boolean.py
index 05533c13009864f77f128c45eb24108f68e900f1..ef8f317ce5f75a264bdb33d101c2b7e18510b1e5 100644
--- a/tests/test_boolean.py
+++ b/tests/test_boolean.py
@@ -33,7 +33,7 @@ from pytest import raises
 
 def teardown_module():
     try:
-        h.execute_query("FIND *").delete()
+        h.execute_query("FIND ENTITY").delete()
     except BaseException:
         pass
 
diff --git a/tests/test_datatype.py b/tests/test_datatype.py
index 9c015ab5bf8007659d498b391d315ed1826897e6..a536d50ccbeb0e620c0f5c0d6046f770a15e116d 100644
--- a/tests/test_datatype.py
+++ b/tests/test_datatype.py
@@ -31,7 +31,7 @@ from pytest import raises
 
 def setup_function(function):
     try:
-        db.execute_query("FIND *").delete()
+        db.execute_query("FIND ENTITY").delete()
     except BaseException:
         pass
 
diff --git a/tests/test_datatype_inheritance.py b/tests/test_datatype_inheritance.py
index 8e22b3edf64b3bfdbddd0bbd6bf571ee3497a9c2..4ab7311ac56baebadd24fb05e967c29fd769c281 100644
--- a/tests/test_datatype_inheritance.py
+++ b/tests/test_datatype_inheritance.py
@@ -36,7 +36,7 @@ def setup_function(function):
 
 def teardown_function(function):
     try:
-        db.execute_query("FIND *").delete()
+        db.execute_query("FIND ENTITY").delete()
     except BaseException:
         pass
 
diff --git a/tests/test_datetime.py b/tests/test_datetime.py
index 4227a94b16feaa767e55bff98dfeb96cfb5028df..3925370a8ca7c8a3bee1da8810c0d15e655cdd25 100644
--- a/tests/test_datetime.py
+++ b/tests/test_datetime.py
@@ -35,7 +35,7 @@ old_stored = None
 
 def setup_function(function):
     try:
-        h.execute_query("FIND *").delete()
+        h.execute_query("FIND ENTITY").delete()
     except BaseException:
         pass
 
diff --git a/tests/test_double.py b/tests/test_double.py
index f710a62dac27f134ac8b597a75cab4a79b505cd9..f01f85e747a27c20a9f7d39200e92bafb723a55f 100644
--- a/tests/test_double.py
+++ b/tests/test_double.py
@@ -26,7 +26,7 @@ import caosdb as db
 
 
 def setup_module():
-    clean = db.execute_query("FIND *")
+    clean = db.execute_query("FIND ENTITY")
     if len(clean) > 0:
         clean.delete()
 
diff --git a/tests/test_empty_text_value.py b/tests/test_empty_text_value.py
index dc4f5cbb5009b84a5d22114130e43faccaa9fe66..dba100e0c0ec4f59a3993b85b3ce6aebaf86819e 100644
--- a/tests/test_empty_text_value.py
+++ b/tests/test_empty_text_value.py
@@ -34,7 +34,7 @@ def setup_function(function):
 
 def teardown_function(function):
     try:
-        db.execute_query("FIND *").delete()
+        db.execute_query("FIND ENTITY").delete()
     except Exception as e:
         print(e)
 
diff --git a/tests/test_error_stuff.py b/tests/test_error_stuff.py
index 2d905be97463d8fb8c83ae744b445eb2b054c651..b43b53ee194a9ec8c598118861786d8e5fde77af 100644
--- a/tests/test_error_stuff.py
+++ b/tests/test_error_stuff.py
@@ -42,7 +42,7 @@ import pytest
 
 def setup_function(function):
     try:
-        h.execute_query("FIND *").delete()
+        h.execute_query("FIND ENTITY").delete()
     except BaseException:
         pass
 
diff --git a/tests/test_importance.py b/tests/test_importance.py
index 709af3d611939168493722410dbeb3907510a489..41668d98c221fb0080aeba47c51104a8343d61f6 100644
--- a/tests/test_importance.py
+++ b/tests/test_importance.py
@@ -27,7 +27,7 @@ def setup_function(function):
 
 
 def teardown_module():
-    clean = db.execute_query("FIND *")
+    clean = db.execute_query("FIND ENTITY")
     if len(clean) > 0:
         clean.delete()
 
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index 7a6c95c09decd97828e65e73c83626d22245c202..a88735d265f1f1ef123600cf719409ae95640223 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -42,7 +42,7 @@ test_pw = "passphrase1P!"
 
 
 def setup_module():
-    d = db.execute_query("FIND *")
+    d = db.execute_query("FIND ENTITY")
     if len(d) > 0:
         d.delete()
     insert_test_user()
@@ -61,7 +61,7 @@ def teardown_module():
         os.remove("test2.dat")
     except BaseException:
         pass
-    d = db.execute_query("FIND *")
+    d = db.execute_query("FIND ENTITY")
     if len(d) > 0:
         d.delete()
 
diff --git a/tests/test_query.py b/tests/test_query.py
index a7f11fa216551726f348aa19d6012bfb38a859ae..33e8220e660a73b3b75e6dac5a63bb64db203925 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -46,7 +46,7 @@ def setup_module():
 def setup_function(function):
     db.administration.set_server_property("FIND_QUERY_DEFAULT_ROLE", "ENTITY")
     try:
-        db.execute_query("FIND *").delete()
+        db.execute_query("FIND ENTITY").delete()
     except Exception as e:
         print(e)
 
@@ -1163,7 +1163,7 @@ def test_query_cache_with_permissions():
 def test_find_star():
     """related: caosdb-server#116"""
     rt = db.RecordType("TestRT").insert()
-    response = db.execute_query("FIND *")[0]
+    response = db.execute_query("FIND ENTITY")[0]
     assert response.id == rt.id
 
 
diff --git a/tests/test_query_template.py b/tests/test_query_template.py
index 7da1e729ff1ffa41d86b572e257848e36b65f1ed..f9c069971703082d438dfe7d9d1badb783a60a1d 100644
--- a/tests/test_query_template.py
+++ b/tests/test_query_template.py
@@ -37,7 +37,7 @@ def setup_module():
     except Exception as e:
         print(e)
     try:
-        db.execute_query("FIND *").delete()
+        db.execute_query("FIND ENTITY").delete()
     except Exception as e:
         print(e)
     db.RecordType(name="TestPerson").insert()
diff --git a/tests/test_tickets.py b/tests/test_tickets.py
index 728edb52de9181e192377c2bfa4072a97dca27a7..106d2f63aeb3c93840a67b86ebd6e51672c3b137 100644
--- a/tests/test_tickets.py
+++ b/tests/test_tickets.py
@@ -33,7 +33,7 @@ from tests import test_misc
 
 
 def setup_function(function):
-    d = db.execute_query("FIND *")
+    d = db.execute_query("FIND ENTITY")
     if len(d) > 0:
         d.delete()
 
diff --git a/tests/test_tickets_200.py b/tests/test_tickets_200.py
index d7647de9584989c4eeb7180a4349e74fd4eee5e3..b6af11aef5d37903fb53de2a96c48a3e44ac98df 100644
--- a/tests/test_tickets_200.py
+++ b/tests/test_tickets_200.py
@@ -37,7 +37,7 @@ def setup_function(function):
 
 def setup_module():
     try:
-        h.execute_query("FIND *").delete()
+        h.execute_query("FIND ENTITY").delete()
     except Exception as e:
         print(e)
 
diff --git a/tests/test_unit.py b/tests/test_unit.py
index 20ef055aabe2064e3322c779cddf21d3586d3b83..fb2a403adc9e5f1bd204f40cbd2d5d248cf3827e 100644
--- a/tests/test_unit.py
+++ b/tests/test_unit.py
@@ -31,7 +31,7 @@ import caosdb as h
 
 def setup_module():
     try:
-        h.execute_query("FIND *").delete()
+        h.execute_query("FIND ENTITY").delete()
     except BaseException:
         pass