@@ -623,11 +623,19 @@
 	    ) ;; (set-signal-handler! signal/stop sighand)
 	  
 	  ;; Do not run the test if it is REMOVING, RUNNING, KILLREQ or REMOTEHOSTSTART,
 	  ;; Mark the test as REMOTEHOSTSTART *IMMEDIATELY*
 	  ;;
-	  (let* ((test-info (rmt:get-test-info-by-id run-id test-id))
+	  (let* ((test-info (let loop ((tries 0))
+			      (let ((tinfo (rmt:get-test-info-by-id run-id test-id)))
+				(if tinfo
+				    tinfo
+				    (if (> tries 10)
+					#f
+					(begin
+					  (thread-sleep! (+ 1 (* tries 10)))
+					  (loop (+ tries 1))))))))
 		 (test-host (if test-info
 				(db:test-get-host        test-info)
 				(begin
 				  (debug:print 0 *default-log-port* "ERROR: failed to find a record for test-id " test-id ", exiting.")
 				  (exit))))