diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index dad6e4a..bd1089c 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -1626,10 +1626,10 @@ public class TestingList extends Panel {
         int row = jTable1.getSelectedRow();
         String sDeviceName = jTable1.getValueAt(row, COL.DEVICENAME.ordinal()).toString();
         String sTestName = jTable1.getValueAt(row, COL.TESTNAME.ordinal()).toString();
-        String sTestPath = String.valueOf(jTable1.getValueAt(row, COL.TESTPATH.ordinal())).replace("\\", File.separator);
+        String sTestPath = Paths.get(String.valueOf(jTable1.getValueAt(row, COL.TESTPATH.ordinal())).replace("\\", File.separator), sTestName + ".py").toString();
         String sTestCaseName = jTable1.getValueAt(row, COL.TESTSUITE.ordinal()).toString();
         String sTestDescription = getTestDescription(sTestPath);
-        String sDevicePath = jTable1.getValueAt(row, COL.DEVICEPATH.ordinal()).toString();
+        String sDevicePath = Paths.get(jTable1.getValueAt(row, COL.DEVICEPATH.ordinal()).toString(), sDeviceName + TESTS_CONFIG_FILENAME).toString();
         String sDeviceDescription = jTable1.getValueAt(row, COL.DEVICEDESCR.ordinal()).toString();
         String sLastResult = jTable1.getValueAt(row, COL.RESULT.ordinal()).toString();
         String sResultTime = jTable1.getValueAt(row, COL.TIME.ordinal()).toString();
@@ -2315,8 +2315,10 @@ public class TestingList extends Panel {
         try {
             ImageIcon icon = null;// new ImageIcon(getClass().getResource("/icons/button_pause-16px.png"));
             DefaultTableModel model = (DefaultTableModel) jTable1.getModel();
-            System.out.println("Dev  Path = " + devicePath);
-            System.out.println("Test Path = " + testPath);
+            //String testPath = FilenameUtils.separatorsToSystem(TESTS_TESTS_DEFAULT_DIR + testSuite + "/" + testName + "/" + testName + ".py");
+            //String testPath = Paths.get(TESTS_TESTS_DEFAULT_DIR.toString(), testSuite, testName, testName + ".py").toString();
+            //String devicePath = Paths.get(TESTS_DEVICES_DEFAULT_DIR.toString(), deviceName, deviceName + ".config").toString();
+            //System.out.println("Path = " + testPath);
             Object rowData[] = new Object[]{false, "", sDate, deviceName, devicePath, deviceDescription, testSuite, testName, testPath, testParams, testDescription, testHelp, "", "Pending", icon};
             //vedify that this test is not already in the table
             int totalRows = model.getRowCount();
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index 397d6b3..aa8d481 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Mon Oct 23 09:11:13 CEST 2017
+#Mon Oct 23 09:18:20 CEST 2017
 customPanel=
 showEnabledTestsOnly=true
 listFilter=rps-test