diff --git a/src/main/java/org/testng/remote/strprotocol/TestResultMessage.java b/src/main/java/org/testng/remote/strprotocol/TestResultMessage.java
index de5c6ce..c31cf67 100755
--- a/src/main/java/org/testng/remote/strprotocol/TestResultMessage.java
+++ b/src/main/java/org/testng/remote/strprotocol/TestResultMessage.java
@@ -97,7 +97,8 @@
   }
   
   public TestResultMessage(final ITestContext testCtx, final ITestResult result) {
-    this(testCtx.getSuite().getName(), result.getTestName(), result);
+    this(testCtx.getSuite().getName(), testCtx.getCurrentXmlTest().getName(), result);
+//        result.getTestName() != null ? result.getTestName() : result.getName(), result);
   }
 
   private void init(final int resultType,