@@ -371,27 +371,26 @@
 	      (test-id     (db:get-test-id db run-id test-name item-path))
 	      (tdat        (db:get-test-info-by-id db test-id)))
 	 (if tdat
 	     (begin
 	       ;; Look at the test state and status
-	       (if (or (member (db:test-get-status tdat) 
-			       '("PASS" "WARN" "WAIVED" "CHECK"))
-		       (member (db:test-get-state tdat)
-			       '("INCOMPLETE" "KILLED")))
+	       (if (or (and (member (db:test-get-status tdat) '("PASS" "WARN" "WAIVED" "CHECK"))
+			    (equal? (db:test-get-state tdat)  "COMPLETED"))
+		       (member (db:test-get-state tdat)       '("INCOMPLETE" "KILLED")))
 		   (set! keep-test #f))
 
 	       ;; examine waitons for any fails. If it is FAIL or INCOMPLETE then eliminate this test
 	       ;; from the runnable list
 	       (if keep-test
 		   (for-each (lambda (waiton)
 			       ;; for now we are waiting only on the parent test
 			       (let* ((parent-test-id (db:get-test-id db run-id waiton ""))
 				      (wtdat (db:get-test-info-by-id db test-id)))
-				 (if (or (member (db:test-get-status wtdat)
-						 '("FAIL" "KILLED"))
-					 (member (db:test-get-state wtdat)
-						 '("INCOMPETE")))
+				 (if (or (and (equal? (db:test-get-state wtdat) "COMPLETED")
+					      (member (db:test-get-status wtdat) '("FAIL")))
+					 (member (db:test-get-status wtdat)  '("KILLED"))
+					 (member (db:test-get-state wtdat)   '("INCOMPETE")))
 				     (set! keep-test #f)))) ;; no point in running this one again
 			     waitons))))
 	 (if keep-test (set! runnables (cons testkeyname runnables)))))
      testkeynames)
     runnables))