diff --git a/Framework/script/o2-qc-multinode-test.sh b/Framework/script/o2-qc-multinode-test.sh
index 24ff4669d6..3be019ea82 100755
--- a/Framework/script/o2-qc-multinode-test.sh
+++ b/Framework/script/o2-qc-multinode-test.sh
@@ -83,13 +83,12 @@ fi
 delete_data
 
 # store data
-o2-qc-run-producer --producers 2 --message-amount 15  --message-rate 1 -b | timeout -k 5s 25s o2-qc --config json://${JSON_DIR}/multinode-test.json -b --local --host localhost --run &
+o2-qc-run-producer --producers 2 --message-amount 15  --message-rate 1 -b | timeout -s INT 25s o2-qc --config json://${JSON_DIR}/multinode-test.json -b --local --host localhost --run &
 
-sleep 3
-timeout -k 5s 30s o2-qc --config json://${JSON_DIR}/multinode-test.json -b --remote --run
+timeout -s INT 30s o2-qc --config json://${JSON_DIR}/multinode-test.json -b --remote --run
 
-# wait until the local QC quits before moving forward
-wait -1
+# wait until the local QC quits before moving forward.
+wait
 
 # check MonitorObject
 # first the return code must be 200