diff --git a/tests/byedpi_validator.sh b/tests/byedpi_validator.sh
index 63c14dc1..40c043b9 100644
--- a/tests/byedpi_validator.sh
+++ b/tests/byedpi_validator.sh
@@ -76,12 +76,4 @@ UCODE
 
 ucode -L "$TACHYON_LIB" "$WORK_DIR/require-byedpi-validator.uc"
 
-TACHYON_BIN="$ROOT_DIR/tachyon/files/usr/bin/tachyon"
-cli_valid_json="$(TACHYON_LIB="$TACHYON_LIB" ucode "$TACHYON_BIN" validate_byedpi_strategy_json '--disorder 3 --fake-sni example.org -N')"
-assert_json_field "$cli_valid_json" valid true
-
-cli_invalid_json="$(TACHYON_LIB="$TACHYON_LIB" ucode "$TACHYON_BIN" validate_byedpi_strategy_json '--port 1080 --disorder 3')"
-assert_json_field "$cli_invalid_json" valid false
-assert_json_field "$cli_invalid_json" needle --port
-
 printf 'ByeDPI validator checks passed\n'
diff --git a/tests/cli_entrypoint.sh b/tests/cli_entrypoint.sh
index 559dd51f..ba7db2a0 100644
--- a/tests/cli_entrypoint.sh
+++ b/tests/cli_entrypoint.sh
@@ -64,6 +64,10 @@ 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' ] ||
+  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)"
 [ "$subscription_out" = $'updates\tsubscription-update\tproxy\t2' ] ||
   fail "subscription_update must dispatch through components/updates.uc with arguments"