diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 67f03be..3b48396 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -1068,17 +1068,15 @@ public class TestingList extends Panel {
 
     private void jButtonRunActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonRunActionPerformed
         if (this.jButtonRun.getToolTipText().equals("Run enabled tests")) {
-            Object pshellStatus, initStatus;
+            Object pshellStatus;
             String sWait = "";
+            //check if pshell is still initialising: if so, don't start the tests
             try {
                 pshellStatus = eval("controller.state");
-                //initStatus   = eval("State.Initializing");
                 System.out.println("status: "+String.valueOf(pshellStatus));
-                //System.out.println("status: "+String.valueOf(initStatus));
                 if(String.valueOf(pshellStatus)=="Initializing"){
                     sWait = "pshell is initialising: please try again in a few seconds...";
-                }
-                
+                }               
             } catch (Exception ex) {
                 Logger.getLogger(TestingList.class.getName()).log(Level.SEVERE, null, ex);
                 sWait = "pshell is initialising: please try again in a few seconds...";
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index ae66661..bc058c2 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Tue Jan 19 10:34:47 CET 2016
+#Tue Jan 19 10:36:03 CET 2016
 customPanel=
 showEnabledTestsOnly=true
 listFilter=LabTests2