@@ -593,11 +593,12 @@
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -test-paths or -test-files, exiting")
 		(exit 1)))
 	  (let* ((keys     (cdb:remote-run db:get-keys db))
 		 (keynames (map key:get-fieldname keys))
-		 (paths    (cdb:remote-run db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
+		 ;; db:test-get-paths must not be run remote
+		 (paths    (db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
@@ -604,11 +605,12 @@
 	(general-run-call 
 	 "-test-files"
 	 "Get paths to test"
 	 (lambda (target runname keys keynames keyvallst)
 	   (let* ((db       #f)
-		  (paths    (cdb:remote-run db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
+		  ;; DO NOT run remote
+		  (paths    (db:test-get-paths-matching db keynames target (args:get-arg "-test-files"))))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
 ;;======================================================================
@@ -643,11 +645,12 @@
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -archive, exiting")
 		(exit 1)))
 	  (let* ((keys     (cdb:remote-run db:get-keys db))
 		 (keynames (map key:get-fieldname keys))
-		 (paths    (cdb:remote-run db:test-get-paths-matching db keynames target)))
+		 ;; DO NOT run remote
+		 (paths    (db:test-get-paths-matching db keynames target)))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
@@ -654,11 +657,12 @@
 	(general-run-call 
 	 "-test-paths"
 	 "Get paths to tests"
 	 (lambda (target runname keys keynames keyvallst)
 	   (let* ((db       #f)
-		  (paths    (cdb:remote-run db:test-get-paths-matching db keynames target)))
+		  ;; DO NOT run remote
+		  (paths    (db:test-get-paths-matching db keynames target)))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
 ;;======================================================================