diff --git a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
index cf5e490000ce38ef122ca30396ba2a81cc680b1a..ec68b712b4b25f0a8c3bd653d5784cfd0a2cd423 100644
--- a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
@@ -18,7 +18,7 @@ std::future<void> serverIsDoneFuture = serverIsDone.get_future();
 
 constexpr size_t kRdmaSize = 5 * 1024 * 1024;
 constexpr int kServerThreads = 2;
-constexpr int kEachInstanceRuns = 10;
+constexpr int kEachInstanceRuns = 3;
 constexpr int kClientThreads = 4;
 
 void ServerChildThread(FabricServer* server, std::atomic<int>* serverTotalRequests, char* expectedRdmaBuffer) {
diff --git a/tests/automatic/asapo_fabric/simple_data_transfer.cpp b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
index 28a2b9ce6316fe3d429618494c742bd6c9ee403d..86054cb9b2f263a3cd70b62dd55090c897e8a0c6 100644
--- a/tests/automatic/asapo_fabric/simple_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
@@ -17,7 +17,7 @@ std::promise<void> serverIsDone;
 std::future<void> serverIsDoneFuture = serverIsDone.get_future();
 
 constexpr int kTotalRuns = 3;
-constexpr int kEachInstanceRuns = 5;
+constexpr int kEachInstanceRuns = 2;
 constexpr size_t kRdmaSize = 5 * 1024 * 1024;
 
 void ServerMasterThread(const std::string& hostname, uint16_t port, char* expectedRdmaBuffer) {
diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
index 553a3b90c33b12c4cbaf3e3d6750596b4f5e8db3..7876150ffe89b6c3907d646453f2446c143ae723 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
@@ -51,10 +51,6 @@ sleep 1
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
-
-mkdir  /tmp/asapo/test_in/processed/test1
-mkdir  /tmp/asapo/test_in/processed/test2
-
 #producer
 echo "Start producer"
 mkdir -p ${receiver_folder}
@@ -63,6 +59,10 @@ producerid=`echo $!`
 
 sleep 1
 
+mkdir  /tmp/asapo/test_in/processed/test1
+mkdir  /tmp/asapo/test_in/processed/test2
+
+
 echo hello > /tmp/asapo/test_in/processed/test1/file1
 echo hello > /tmp/asapo/test_in/processed/test1/file2
 echo hello > /tmp/asapo/test_in/processed/test2/file1
diff --git a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
index 11199a46a2c3cb343df16f8a9eab4274ce7531ef..d56abbb21fba5d8773db7d5cbf903742ef037bc1 100644
--- a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
+++ b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
@@ -83,7 +83,7 @@ start_mongo
 
 wait
 
-echo "db.data_default.validate(true)" | mongo --port 27016 ${beamtime_id}_detector
+echo "db.data_default.validate({full: true})" | mongo --port 27016 ${beamtime_id}_detector
 
 echo processed files:
 echo "db.data_default.count()" | mongo --port 27016 ${beamtime_id}_detector
diff --git a/tests/valgrind.suppressions b/tests/valgrind.suppressions
index 2c21d104a09bbf2e4a911e3f38cdbda5e5e16516..5df24de1c40daa0ee06de0720e6b1f4580b66377 100644
--- a/tests/valgrind.suppressions
+++ b/tests/valgrind.suppressions
@@ -95,7 +95,6 @@
    Memcheck:Param
    socketcall.sendto(msg)
    fun:send
-   fun:ofi_send_socket
 }
 {
    asapo_fabric__sockets__leak