diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index c3582cf..9a2ef0e 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -63,12 +63,14 @@ public class TestingList extends Panel {
             Object ret = eval("ret");
             boolean status = (boolean) eval("status");
             Object deviceName = eval("DEVICE");
-            String sStatus = (status == true) ? TestStatus.SUCCESS.toString() : TestStatus.FAILURE.toString();
+            String sStatus = (status == true) ? TestStatus.SUCCESS.toString() : TestStatus.FAILURE.toString();      
 
             
             if (ret != "" ) {
+                File fTest = new File(fileName);   
+                String sTestName = fTest.getName();
                 //SwingUtils.showMessage(getComponent(), "", ret.toString() + " - " + ret.getClass().getName());
-                iCurrentTestPos = testingList.showResult(deviceName.toString(), fileName, ret.toString(), sStatus);
+                iCurrentTestPos = testingList.showResult(deviceName.toString(), sTestName, ret.toString(), sStatus);
                 //start next test
                 if(iCurrentTestPos>=0 && testingList.isTestRunAllowed())
                 {
@@ -451,11 +453,11 @@ public class TestingList extends Panel {
             switch (status) {
                 case "Success":
                     icon = TestStatus.SUCCESS.Icon();
-                    logger.log(Level.INFO, "Device: " + testName + "; Test: " + testName + " Result: " + res + " (" + status + ")");
+                    logger.log(Level.INFO, "Device: " + deviceName + "; Test: " + testName + " Result: " + res + " (" + status + ")");
                     break;
                 case "Failure":
                     icon = TestStatus.FAILURE.Icon();
-                    logger.log(Level.SEVERE, "Device: " + testName + "; Test: " + testName + " Result: " + res + " (" + status + ")");
+                    logger.log(Level.SEVERE, "Device: " + deviceName + "; Test: " + testName + " Result: " + res + " (" + status + ")");
                     break;
                 case "Running":
                     icon = TestStatus.RUNNING.Icon();