diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index c76d3ca..9248b05 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -2486,7 +2486,7 @@ public class TestingList extends Panel {
     private HashMap getParameters(String sTestPath, String sDevicePath) {
         HashMap deviceParams = buildParametersMap(getConfigItem("parameters", sDevicePath));
         HashMap testParams   = buildParametersMap(getConfigItem("parameters", sTestPath));
-        HashMap params;
+        HashMap params = new HashMap();
         if(deviceParams.isEmpty()){
             return testParams;
         }
@@ -2495,23 +2495,18 @@ public class TestingList extends Panel {
         while (itD.hasNext()) {
             Map.Entry pairD = (Map.Entry)itD.next();
             System.out.println(pairD.getKey() + " = " + pairD.getValue());
-            Iterator itT = testParams.entrySet().iterator();
-            while (itT.hasNext()) {
-                Map.Entry pairT = (Map.Entry)itT.next();
-                if(pairT.getKey().toString().equals(pairD.getKey().toString())){
-                    System.out.println("test:   " + pairT.getKey() + " = " + pairT.getValue());
-                    System.out.println("device: " + pairD.getKey() + " = " + pairD.getValue());
-                }
-            }              
-            //it.remove(); // avoids a ConcurrentModificationException
-        }        
+            params.putIfAbsent(pairD.getKey(), pairD.getValue());             
+        } 
         Iterator it = testParams.entrySet().iterator();
         System.out.println("testParams: " + testParams.size());
         while (it.hasNext()) {
             Map.Entry pair = (Map.Entry)it.next();
             System.out.println(pair.getKey() + " = " + pair.getValue());
-            //it.remove(); // avoids a ConcurrentModificationException
-        }     
+            // add parameter only if not already on device parameters
+            params.putIfAbsent(pair.getKey(), pair.getValue());
+        }          
+       
+   
         return testParams;
     }
     
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index 77dc409..0acda0e 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Thu Aug 31 16:55:03 CEST 2017
+#Thu Aug 31 17:03:51 CEST 2017
 customPanel=
 showEnabledTestsOnly=true
 listFilter=rps-try