@@ -1041,13 +1041,14 @@
 			 is-completed
 			 is-ok)
 		    (set! item-waiton-met #t)))))
 	      tests)
 	     (if (not (or parent-waiton-met item-waiton-met))
-		 (set! result (cons waitontest-name result)))
+		 (set! result (append tests result)))
 	     ;; if the test is not found then clearly the waiton is not met...
-	     (if (not ever-seen)(set! result (cons waitontest-name result)))))
+	     ;; (if (not ever-seen)(set! result (cons waitontest-name result)))))
+	     (if (not ever-seen)(set! result (append tests result)))))
 	waitons)
       (delete-duplicates result))))
 
 (define (db:teststep-set-status! db test-id teststep-name state-in status-in item-path comment logfile)
   (debug:print 4 "test-id: " test-id " teststep-name: " teststep-name)