diff --git a/test/shell.d/omarchycn-test.sh b/test/shell.d/omarchycn-test.sh
index 5ec310dc..abe18168 100755
--- a/test/shell.d/omarchycn-test.sh
+++ b/test/shell.d/omarchycn-test.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 source "$(dirname -- "${BASH_SOURCE[0]}")/base-test.sh"
 
 export OMARCHY_PATH="$ROOT"
@@ -30,13 +32,15 @@ grep -q '^registry=https://registry.npmmirror.com$' "$HOME/.npmrc" || fail "npm
 grep -q '^save-exact=true$' "$HOME/.npmrc" || fail "unrelated npmrc keys preserved"
 pass "dev-mirror apply china manages npm registry non-destructively"
 
-# Dev-mirror: cargo official leaves no crates-io takeover
+# Dev-mirror: cargo china installs the block, official removes it completely
 omarchy-cn-dev-mirror-apply china --target cargo > /dev/null
+grep -q 'replace-with = "omarchycn"' "$HOME/.cargo/config.toml" || fail "cargo china writes source replacement"
+grep -q 'rsproxy.cn' "$HOME/.cargo/config.toml" || fail "cargo china points at the registry URL"
 omarchy-cn-dev-mirror-apply official --target cargo > /dev/null
 if grep -q "crates-io" "$HOME/.cargo/config.toml"; then
   fail "cargo official removes managed source block"
 fi
-pass "dev-mirror cargo official removes the managed block"
+pass "dev-mirror cargo china installs and official removes the block"
 
 # IME: profile installs rime as default, hotkey surgery keeps other sections
 mkdir -p "$HOME/.config/fcitx5"
@@ -46,8 +50,11 @@ printf '[Behavior]\nShareInputState=No\n\n[Hotkey/TriggerKeys]\n0=Zenkaku_Hankak
 omarchy-cn-ime-hotkey super-space > /dev/null
 grep -q '^ShareInputState=No$' "$HOME/.config/fcitx5/config" || fail "hotkey surgery preserves other sections"
 grep -q '^0=Super+space$' "$HOME/.config/fcitx5/config" || fail "hotkey surgery sets trigger"
-grep -q 'SUPER + ALT + SPACE' "$HOME/.config/hypr/bindings.lua" || fail "menu migration block written"
+grep -q 'hl.unbind("SUPER + SPACE")' "$HOME/.config/hypr/bindings.lua" || fail "menu key unbound"
+grep -q 'hl.unbind("SUPER + ALT + SPACE")' "$HOME/.config/hypr/bindings.lua" || fail "apps menu key unbound before rebind"
+grep -q 'o.bind("SUPER + ALT + SPACE", "Omarchy menu"' "$HOME/.config/hypr/bindings.lua" || fail "menu rebound to Super+Alt+Space"
 omarchy-cn-ime-hotkey ctrl-space > /dev/null
+grep -q '^0=Control+space$' "$HOME/.config/fcitx5/config" || fail "ctrl-space restores Control+space trigger"
 if grep -q 'OmarchyCN ime hotkey begin' "$HOME/.config/hypr/bindings.lua"; then
   fail "ctrl-space removes migration block"
 fi