diff --git a/smoketest/fingerprint b/smoketest/fingerprint
index 64a7f2a..0fbd599 100755
--- a/smoketest/fingerprint
+++ b/smoketest/fingerprint
@@ -65,7 +65,8 @@ for cmd in update refresh sibling version configure audit; do
 done
 
 section "Shell"
-grep -n coredesktop ~/.bashrc
+# All of ~/.bashrc, sorted: an updated machine adds lines in another order
+sort ~/.bashrc
 
 section "GNOME extensions"
 gsettings get org.gnome.shell enabled-extensions
diff --git a/smoketest/scenarios/30-upgrade-from-baseline.sh b/smoketest/scenarios/30-upgrade-from-baseline.sh
index f360d93..e118026 100644
--- a/smoketest/scenarios/30-upgrade-from-baseline.sh
+++ b/smoketest/scenarios/30-upgrade-from-baseline.sh
@@ -20,9 +20,16 @@ scenario() {
   #   herdr-bin provides herdr, and is what HEAD installs instead
   # - Plain gext install asks GNOME Shell, which shows a dialog no one clicks;
   #   --filesystem doesn't ask, and is what HEAD does
+  # - voxtype from source no longer links without clang and cmake, which later
+  #   commits (and HEAD) install
+  # - install.sh sources install-kickstart-nvim.sh, whose set -u then stops
+  #   bitwarden.sh on its unset LINE; without set -u, that line did nothing
   upstream_commit "Smoketest: fixes to install this baseline in a VM" '
     sed -i "s/^\([[:space:]]*\)herdr$/\1herdr-bin/" packages.conf
+    grep -qx "[[:space:]]*clang" packages.conf \
+      || sed -i "s/^\([[:space:]]*\)voxtype$/\1clang\n\1cmake\n\1voxtype/" packages.conf
     sed -i "s|gext install|gext --filesystem install|" gnome/gnome-extensions.sh
+    sed -i "s/\"\$LINE\"/\"\${LINE:-}\"/g" bitwarden.sh
     git diff --quiet && exit 0'
 
   # Older installers also run flatpak install as the user, which polkit allows