diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index f02e860..8b25247 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -345,22 +345,6 @@ public class TestingList extends Panel {
 
     private void jButtonRunActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonRunActionPerformed
         if(this.jButtonRun.getToolTipText().equals("Run selected tests")){
-            setButtonToStart();
-            executeTest(0);
-        }
-        else{
-            setButtonToStop();
-        }
-    }//GEN-LAST:event_jButtonRunActionPerformed
-
-    private void setButtonToStop(){
-            abort();
-            this.jButtonRun.setToolTipText("Run selected tests");
-            jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play-64px.png")));        
-            this.jTable1.setEnabled(true);
-    }
-    
-     private void setButtonToStart(){
          Object state = null;
          try {
                 state = eval("state");
@@ -377,12 +361,28 @@ public class TestingList extends Panel {
             } catch (TaskRunningException ex) {
                 Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, ex);
             }
-         if(state.toString().equals("Ready")){
+         if(state.toString().equals("Ready")){            
+            setButtonToStart();
+            executeTest(0);
+         }
+        }
+        else{
+            setButtonToStop();
+        }
+    }//GEN-LAST:event_jButtonRunActionPerformed
+
+    private void setButtonToStop(){
+            abort();
+            this.jButtonRun.setToolTipText("Run selected tests");
+            jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play-64px.png")));        
+            this.jTable1.setEnabled(true);
+    }
+    
+     private void setButtonToStart(){
             this.jButtonRun.setToolTipText("Stop tests");
             jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_stop-64px.png")));  
             this.jTable1.clearSelection();
             this.jTable1.setEnabled(false);
-         }
     }