@@ -2941,11 +2941,11 @@
                        SET state=CASE 
                                    WHEN (SELECT count(id) FROM tests 
                                                 WHERE testname=?
                                                      AND item_path != '' 
                                                      AND status IN ('INCOMPLETE')
-                                                     AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'INCOMPLETE'
+                                                     AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'RUNNING'
                                    WHEN (SELECT count(id) FROM tests 
                                                 WHERE testname=?
                                                      AND item_path != '' 
                                                      AND status NOT IN ('TEN_STRIKES','BLOCKED')
                                                      AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'RUNNING'
@@ -2966,11 +2966,11 @@
                                               AND state IN ('BLOCKED','INCOMPLETE')) > 0 THEN 'FAIL'
                                   WHEN (SELECT count(id) FROM tests
                                          WHERE testname=?
                                               AND item_path != ''
                                               AND state NOT IN ('DELETED')
-                                              AND status = 'ABORT') > 0 THEN 'ABORT'
+                                              AND status IN ('INCOMPLETE','ABORT')) > 0 THEN 'ABORT'
                                   WHEN (SELECT count(id) FROM tests
                                          WHERE testname=?
                                               AND item_path != ''
                                               AND state NOT IN ('DELETED')
                                               AND status = 'AUTO') > 0 THEN 'AUTO'