@@ -1407,15 +1407,26 @@
 	     (tfullname   (db:test-make-full-name test-name item-path))
 	      ;; these are hard coded item-item waits test/item-path => test/item-path2 ...
 	     (extra-waits (let* ((section (configf:get-section (tests:testqueue-get-testconfig test-record) "waitons"))
 				 (myextra (alist-ref tfullname section equal?)))
 			    (if myextra
-				(begin
-				  (debug:print 0 *default-log-port* "HAVE EXTRA WAITONS: " myextra)
-				  (string-split (car myextra)))
+				(let ((extras (string-split (car myextra))))
+				  (if (runs:lownoise (conc tfullname "extra-waitons" tfullname) 60)
+				      (debug:print-info 0 *default-log-port* "HAVE EXTRA WAITONS for test " tfullname ": " myextra))
+				  (for-each
+				   (lambda (extra)
+				     ;; (debug:print 0 *default-log-port* "FYI: extra = " extra " reruns = " reruns)
+				     (let ((basetestname (car (string-split extra "/"))))
+				       #;(if (not (member extra tal))
+					   (set! reruns (append tal (list extra))))
+				       (if (not (member basetestname tal))
+					   (set! reruns (append tal (list basetestname))))
+				       ))
+				   extras)
+				  extras)
 				'())))
-	     (waitons     (append (tests:testqueue-get-waitons    test-record) extra-waits))
+	     (waitons     (delete-duplicates (append (tests:testqueue-get-waitons test-record) extra-waits) equal?))
 	     (newtal      (append tal (list hed)))
 	     (regfull     (>= (length reg) reglen))
 	     (num-running (rmt:get-count-tests-running-for-run-id run-id))
 	     (testdat     (make-runs:testdat
 			   hed: hed