Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -302,16 +302,14 @@
 		(let ((sync-time (- (current-seconds) start-time)))
 		  (db:multi-db-sync (list run-id) 'new2old)
 		  (if (common:low-noise-print 30 "sync new to old")
 		      (begin
 			(debug:print-info 0 "Sync of newdb to olddb for run-id " run-id " completed in " sync-time " seconds")
-			(if (and (> sync-time 10) ;; took more than ten seconds, start a server for this run
-				 (hash-table-ref/default servers-started run-id #f))
+			(if (> sync-time 10) ;; took more than ten seconds, start a server for this run
 			    (begin
 			      (debug:print-info 0 "Sync is taking a long time, start up a server to assist for run " run-id)
-			      (server:kind-run run-id)
-			      (hash-table-set! servers-started run-id #t)))))
+			      (server:kind-run run-id)))))
 		  (hash-table-delete! *db-local-sync* run-id)))
 	    (mutex-unlock! *db-multi-sync-mutex*))
 	  (hash-table-keys *db-local-sync*)))
 
        ;; keep going unless time to exit

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -672,13 +672,15 @@
      ;;
      ((not (hash-table-ref/default test-registry (runs:make-full-test-name test-name item-path) #f))
       (debug:print-info 4 "Pre-registering test " test-name "/" item-path " to create placeholder" )
       ;; always do firm registration now in v1.60 and greater ;; (eq? *transport-type* 'fs) ;; no point in parallel registration if use fs
       (rmt:general-call 'register-test run-id run-id test-name item-path)
+      (hash-table-set! test-registry (runs:make-full-test-name test-name item-path) 'done)
       (if (not (eq? (hash-table-ref/default test-registry (runs:make-full-test-name test-name "") #f) 'done))
-	  (rmt:general-call 'register-test run-id run-id test-name ""))
-      (hash-table-set! test-registry (runs:make-full-test-name test-name item-path) 'done)
+	  (begin
+	    (rmt:general-call 'register-test run-id run-id test-name "")
+	    (hash-table-set! test-registry (runs:make-full-test-name test-name "") 'done)))
       (runs:shrink-can-run-more-tests-count)   ;; DELAY TWEAKER (still needed?)
       (if (and (null? tal)(null? reg))
 	  (list hed tal (append reg (list hed)) reruns)
 	  (list (runs:queue-next-hed tal reg reglen regfull)
 		(runs:queue-next-tal tal reg reglen regfull)

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -114,11 +114,11 @@
 ;; kind start up of servers, wait 40 seconds before allowing another server for a given
 ;; run-id to be launched
 (define (server:kind-run run-id)
   (let ((last-run-time (hash-table-ref/default *server-kind-run* run-id #f)))
     (if (or (not last-run-time)
-	    (> (- (current-seconds) last-run-time) 40))
+	    (> (- (current-seconds) last-run-time) 30))
 	(begin
 	  (server:run run-id)
 	  (hash-table-set! *server-kind-run* run-id (current-seconds))))))
 
 ;; The generic run a server command. Dispatches the call to server 0 if run-id != 0