Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -66,19 +66,18 @@
 	    (let ((start-res (http-transport:client-connect run-id ;; NB// confusion over server-dat and connection result!
 							    (car  server-dat)
 							    (cadr server-dat))))
 	      (if start-res ;; sucessful login?
 		  start-res
-		  (if (and (< remaining-tries 10)
-			   (odd? remaining-tries))
+		  (if (eq? remaining-tries 6)
 		      (begin    ;; login failed
-			;; (hash-table-delete! *runremote* run-id)
-			;; (open-run-close tasks:server-force-clean-run-record
-			;; 		tasks:open-db
-			;; 		run-id 
-			;; 		(car  server-dat)
-			;; 		(cadr server-dat))
+			(hash-table-delete! *runremote* run-id)
+			(open-run-close tasks:server-force-clean-run-record
+			 		tasks:open-db
+			 		run-id 
+			 		(car  server-dat)
+			 		(cadr server-dat))
 			(thread-sleep! 5)
 			(client:setup run-id remaining-tries: (- remaining-tries 1)))
 		      (begin
 			(thread-sleep! 5)
 			(client:setup run-id remaining-tries: (- remaining-tries 1))))))
@@ -87,12 +86,11 @@
 		  (let ((start-res (http-transport:client-connect run-id
 								  (tasks:hostinfo-get-interface server-dat)
 								  (tasks:hostinfo-get-port      server-dat))))
 		    (if start-res
 			start-res
-			(if (and (< remaining-tries 10)
-				 (odd? remaining-tries))
+			(if (eq? remaining-tries 6)
 			    (begin    ;; login failed
 			      (hash-table-delete! *runremote* run-id)
 			      (open-run-close tasks:server-force-clean-run-record
 					      tasks:open-db
 					      run-id 

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -312,11 +312,11 @@
 	 (server-timeout (let ((tmo (config-lookup  *configdat* "server" "timeout")))
 			   (if (and (string? tmo)
 				    (string->number tmo))
 			       (* 60 60 (string->number tmo))
 			       ;; (* 3 24 60 60) ;; default to three days
-			       (* 60 60)         ;; default to one hour
+			       (* 60 1)         ;; default to one minute
 			       ))))
     (let loop ((count         0)
 	       (server-state 'available))
       ;; Use this opportunity to sync the inmemdb to db
       (let ((start-time (current-milliseconds))

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -22,11 +22,11 @@
 # this may save a few milliseconds on launching tests
 # launchwait no
 waivercommentpatt ^WW\d+ [a-z].*
 
 # Use http instead of direct filesystem access
-transport http
+# transport http
 # transport fs
 
 # If set to "default" the old code is used. Otherwise defaults to 200 or uses
 # numeric value given.
 #
@@ -116,11 +116,11 @@
 port 8080
 
 # This server will keep running this number of hours after last access. 
 # Three minutes is 0.05 hours
 # timeout 0.025
-timeout 1
+timeout 0.1
 
 ## disks are:
 ## name host:/path/to/area
 ## -or-
 ## name /path/to/area