diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
index fab0171c5..3ca33b292 100644
--- a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
+++ b/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioParserTest.java
@@ -107,7 +107,7 @@ public class NBCLIScenarioParserTest {
                 "cycles", "20",
                 "cycles-test", "20",
                 "driver", "stdout",
-                "labels","workload:scenario_test",
+                "labels","workload:$scenario_test",
                 "workload", "scenario-test"
         ));
     }
@@ -121,7 +121,7 @@ public class NBCLIScenarioParserTest {
                 "alias", "schema",
                 "cycles-test", "20",
                 "driver", "stdout",
-                "labels","workload:scenario_test",
+                "labels","workload:$scenario_test",
                 "tags", "block:\"schema.*\"",
                 "workload", "scenario-test"
         ));
@@ -172,7 +172,7 @@ public class NBCLIScenarioParserTest {
                 "alias", "schema",
                 "cycles-test", "20",
                 "driver", "stdout",
-                "labels","workload:scenario_test",
+                "labels","workload:$scenario_test",
                 "tags", "block:\"schema.*\"",
                 "workload", "scenario-test"
         ));
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java b/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
index e8a870f4f..af938fb88 100644
--- a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
+++ b/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
@@ -63,7 +63,7 @@ public class SystemIdTest {
     @Test
     public void testGenSessionCode() {
         String sessionCode=SystemId.genSessionCode(234L);
-        assertThat(sessionCode).matches("[0-9a-zA-Z~-]+_[0-9a-zA-Z~-]+");
+        assertThat(sessionCode).matches("[0-9a-zA-Z~-]+");
         logger.info("session code: " + sessionCode);
     }