diff --git a/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java b/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
index 19ecf7054..ce95c061b 100644
--- a/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
+++ b/source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
@@ -669,6 +669,9 @@ && isNotAlreadyDefined(caps, "appWaitActivity"))) {
                 if (isNotAlreadyDefined(caps, "name")) {
                     String externalExeName = parameterService.getParameterStringByKey("cerberus_browserstack_defaultexename", tCExecution.getSystem(), "Exe : %EXEID%");
                     externalExeName = externalExeName.replace("%EXEID%", String.valueOf(tCExecution.getId()));
+                    externalExeName = externalExeName.replace("%TESTFOLDER%", String.valueOf(tCExecution.getTest()));
+                    externalExeName = externalExeName.replace("%TESTID%", String.valueOf(tCExecution.getTestCase()));
+                    externalExeName = externalExeName.replace("%TESTDESCRIPTION%", String.valueOf(tCExecution.getDescription()));
                     caps.setCapability("name", externalExeName);
                 }
                 if (tCExecution.getVerbose() >= 2) {