diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 2d03c4c..19a988e 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -255,17 +255,24 @@ 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")){
             this.executeTest(0);
-            this.jButtonRun.setToolTipText("Stop tests");
-            jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_stop-64px.png")));
+            setButtonToStart();
         }
         else{
-            this.jButtonRun.setToolTipText("Run selected tests");
-            jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play-64px.png")));
+            setButtonToStop();
         }
-        
-
     }//GEN-LAST:event_jButtonRunActionPerformed
 
+    private void setButtonToStop(){
+            this.jButtonRun.setToolTipText("Run selected tests");
+            jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_play-64px.png")));        
+    }
+    
+     private void setButtonToStart(){
+            this.jButtonRun.setToolTipText("Stop tests");
+            jButtonRun.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/button_stop-64px.png")));  
+    }
+    
+    
     private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
         boolean bSelected = jCheckBox1.isSelected();
         int iSelRows = jTable1.getSelectedRowCount();
@@ -470,7 +477,10 @@ public class TestingList extends Panel {
                         SwingUtils.showMessage(this, "getTestInProgress()", ex.toString());
                     }
                 } 
-            }     
+            }    
+            else{ //reached end of list. Stop 
+                setButtonToStop();
+            }
         }
         
         //table management