diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/TestRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/TestRunner.java
index 475f62354..ca9e3602b 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/TestRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/TestRunner.java
@@ -156,11 +156,13 @@ protected void tearDown(DeviceInfo deviceInfo, TestTask testTask, TestRun testRu
         deviceManager.testDeviceUnset(deviceInfo, testRun.getLogger());
 
         //generate xml report and upload files
-        try {
-            String absoluteReportPath = xmlBuilder.buildTestResultXml(testTask, testRun);
-            testRun.setTestXmlReportPath(deviceManager.getTestBaseRelPathInUrl(new File(absoluteReportPath)));
-        } catch (Exception e) {
-            testRun.getLogger().error("Error in buildTestResultXml", e);
+        if (testRun.getTotalCount() > 0) {
+            try {
+                String absoluteReportPath = xmlBuilder.buildTestResultXml(testTask, testRun);
+                testRun.setTestXmlReportPath(deviceManager.getTestBaseRelPathInUrl(new File(absoluteReportPath)));
+            } catch (Exception e) {
+                testRun.getLogger().error("Error in buildTestResultXml", e);
+            }
         }
         if (testTaskRunCallback != null) {
             try {