@@ -1821,11 +1821,11 @@
 		      (string-split inl)))
 	       data)))))
 
 ;; for each test:
 ;;   
-(define (tests:filter-non-runnable run-id testkeynames testrecordshash)
+(define (tests:filter-non-runnable run-id testkeynames testrecordshash #!optional (override-statuses '()))
   (let ((runnables '()))
     (for-each
      (lambda (testkeyname)
        (let* ((test-record (hash-table-ref testrecordshash testkeyname))
 	      (test-name   (tests:testqueue-get-testname  test-record))
@@ -1838,10 +1838,12 @@
 	 (if tdat
 	     (begin
 	       ;; Look at the test state and status
 	       (if (or (and (member (db:test-get-status tdat) 
 				    '("PASS" "WARN" "WAIVED" "CHECK" "SKIP"))
+			    (not (member (db:test-get-status tdat)
+					 override-status))
 			    (equal? (db:test-get-state tdat) "COMPLETED"))
 		       (member (db:test-get-state tdat)
 				    '("INCOMPLETE" "KILLED")))
 		   (set! keep-test #f))