diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index d90cba0..bd5df57 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -1282,12 +1282,12 @@ public class TestingList extends Panel {
     }
     
     public void stopAll(String resultMessage){ 
+        setToStopped();
         String testInProgress[] = getTestInProgress();
         while(testInProgress[0]!=""){
             testInProgress = getTestInProgress();
             showResult(testInProgress[0], testInProgress[1], resultMessage, "false");
         }
-        setToStopped();
     }
 
     /**
@@ -1398,7 +1398,8 @@ public class TestingList extends Panel {
                     //collect tests to be launched in parallel
                     //the test must be: selected, set as start with previous, pending.
                     //alternatively, the test must be: selected, first of the list.
-
+                    if(!isTestRunAllowed())
+                        return;
                     //System.out.println(String.valueOf(row) + "\t" + String.valueOf(bSelected) + "\t" + String.valueOf(selectedTestsRows.length) + "\t" + sStartSequence + "\t" + sStatus);
                     if (bSelected
                             && sStatus.equals(TestStatus.PENDING.toString())
@@ -1516,6 +1517,8 @@ public class TestingList extends Panel {
                         showResult(sDeviceName, sTestPath, "Cannot find test script: " + sTestPath, TestStatus.FAILURE.toString());
                         continue;
                     }
+                    if(!isTestRunAllowed())
+                        return iRet;
                     showResult(sDeviceName, sTestPath, "Test running", TestStatus.RUNNING.toString());
                     //launch the test
                     if (!mParameters.isEmpty()) {