diff --git a/tachyon/files/usr/bin/tachyon b/tachyon/files/usr/bin/tachyon
index 18ae9d65..9600c0aa 100755
--- a/tachyon/files/usr/bin/tachyon
+++ b/tachyon/files/usr/bin/tachyon
@@ -312,7 +312,7 @@ function run_spec(command, spec, user_args) {
         return 1;
     }
 
-    let args = [ "ucode", "-L", LIB_DIR, module, spec[1] ];
+    let args = [ "ucode", "-L", LIB_DIR, "--", module, spec[1] ];
     let count = int(spec[2] || 0);
     for (let i = 0; i < count; i++)
         push(args, user_args[i] || "");
diff --git a/tachyon/files/usr/lib/diagnostics/runtime.uc b/tachyon/files/usr/lib/diagnostics/runtime.uc
index db56eaff..1df37106 100644
--- a/tachyon/files/usr/lib/diagnostics/runtime.uc
+++ b/tachyon/files/usr/lib/diagnostics/runtime.uc
@@ -294,7 +294,7 @@ function get_all_dns_servers(cfg, key) {
 }
 
 function module_args(module_path, args) {
-    let result = [ "ucode", "-L", LIB_DIR, module_path ];
+    let result = [ "ucode", "-L", LIB_DIR, "--", module_path ];
     for (let arg in args)
         push(result, arg);
     return result;
diff --git a/tests/cli_entrypoint.sh b/tests/cli_entrypoint.sh
index ba7db2a0..dd5133e7 100644
--- a/tests/cli_entrypoint.sh
+++ b/tests/cli_entrypoint.sh
@@ -64,8 +64,8 @@ show_version_out="$(TACHYON_LIB="$fake_lib" ucode "$TACHYON_BIN" show_version)"
 [ "$show_version_out" = $'diagnostics\tshow-version\t\t\t' ] ||
   fail "show_version must dispatch through diagnostics/runtime.uc"
 
-byedpi_val_out="$(TACHYON_LIB="$fake_lib" ucode "$TACHYON_BIN" validate_byedpi_strategy_json '--disorder 3')"
-[ "$byedpi_val_out" = $'diagnostics\tvalidate-byedpi-strategy-json\t--disorder 3\t\t' ] ||
+byedpi_val_out="$(TACHYON_LIB="$fake_lib" ucode "$TACHYON_BIN" validate_byedpi_strategy_json 'strategy_dummy')"
+[ "$byedpi_val_out" = $'diagnostics\tvalidate-byedpi-strategy-json\tstrategy_dummy\t\t' ] ||
   fail "validate_byedpi_strategy_json must dispatch through diagnostics/runtime.uc with arguments"
 
 subscription_out="$(TACHYON_LIB="$fake_lib" ucode "$TACHYON_BIN" subscription_update proxy 2)"