diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 347b8696e015cdf865fe94623599f4cf8cb07143..9a070635f8b1b6fd6e4f0417aef1dd8dde83afcd 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -67,7 +67,7 @@ protected:
 
     caosdb_transaction_transaction query_transaction;
     caosdb_connection_connection_create_transaction(&connection, &query_transaction);
-    caosdb_transaction_transaction_query(&query_transaction, "FIND ENTITY WITH id > 99");
+    caosdb_transaction_transaction_query(&query_transaction, "FIND ENTITY");
     caosdb_transaction_transaction_execute(&query_transaction);
 
     caosdb_transaction_result_set result_set;
diff --git a/test/test_issues.cpp b/test/test_issues.cpp
index 9935eb179b3768f736a8ba37bdca5dc58d92a14f..8359d0f43e492aa5723a990a7abf9273e7c1b0cf 100644
--- a/test/test_issues.cpp
+++ b/test/test_issues.cpp
@@ -47,7 +47,7 @@ public:
     // delete all entities
     const auto &connection = caosdb::connection::ConnectionManager::GetDefaultConnection();
     auto query_transaction(connection->CreateTransaction());
-    query_transaction->Query("FIND ENTITY WITH id > 99");
+    query_transaction->Query("FIND ENTITY");
     query_transaction->Execute();
     if (query_transaction->GetResultSet().size() > 0) {
       std::cout << "Cleanup: Deleting " << query_transaction->GetResultSet().size() << " entities."
diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp
index b60c58fadff358b878108ca72edbb67b1af3f26e..40cce6590440ec9a683fb71647f6ce5477f52918 100644
--- a/test/test_list_properties.cpp
+++ b/test/test_list_properties.cpp
@@ -44,7 +44,7 @@ protected:
   static void DeleteEntities() {
     const auto &connection = caosdb::connection::ConnectionManager::GetDefaultConnection();
     auto query_transaction(connection->CreateTransaction());
-    query_transaction->Query("FIND ENTITY WITH id > 99");
+    query_transaction->Query("FIND ENTITY");
     query_transaction->Execute();
     if (query_transaction->GetResultSet().size() > 0) {
       auto delete_transaction(connection->CreateTransaction());
diff --git a/test/test_properties.cpp b/test/test_properties.cpp
index 95dffb7f0aedea4b8016b332315175ed8a3b1d56..216234420ccacde25e7173f9489fc1f0253789bd 100644
--- a/test/test_properties.cpp
+++ b/test/test_properties.cpp
@@ -39,7 +39,7 @@ protected:
   static void DeleteEntities() {
     const auto &connection = caosdb::connection::ConnectionManager::GetDefaultConnection();
     auto query_transaction(connection->CreateTransaction());
-    query_transaction->Query("FIND ENTITY WITH id > 99");
+    query_transaction->Query("FIND ENTITY");
     query_transaction->Execute();
     if (query_transaction->GetResultSet().size() > 0) {
       auto delete_transaction(connection->CreateTransaction());
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 0eec6d775747c3df39f6bb2c746e56628c6eadb3..c64ca2f7f6301e4e25d8db702fc0c45a651d6cf3 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -103,7 +103,7 @@ public:
     // delete all entities
     const auto &connection = caosdb::connection::ConnectionManager::GetDefaultConnection();
     auto query_transaction(connection->CreateTransaction());
-    query_transaction->Query("FIND ENTITY WITH id > 99");
+    query_transaction->Query("FIND ENTITY");
     query_transaction->Execute();
     if (query_transaction->GetResultSet().size() > 0) {
       std::cout << "Cleanup: Deleting " << query_transaction->GetResultSet().size() << " entities."