diff --git a/scripts/stop-dev.sh b/scripts/stop-dev.sh
index 2531bd0eb..ea4cf4c63 100755
--- a/scripts/stop-dev.sh
+++ b/scripts/stop-dev.sh
@@ -56,7 +56,8 @@ has_service() {
 is_multinode() {
     local config_file="$CONFIG_DIR/hive.toml"
     if [ -f "$config_file" ]; then
-        local node_count=$(grep -c '^\[nodes\.' "$config_file")
+        # Count only top-level node sections [nodes.X], not subsections [nodes.X.Y]
+        local node_count=$(grep -cE '^\[nodes\.[^.]+\]' "$config_file")
         [ "$node_count" -gt 1 ]
     else
         return 1
diff --git a/tests/e2e/run-e2e.sh b/tests/e2e/run-e2e.sh
index 6b7b12361..d02c043aa 100755
--- a/tests/e2e/run-e2e.sh
+++ b/tests/e2e/run-e2e.sh
@@ -35,6 +35,7 @@ cleanup() {
         fi
     fi
     ./scripts/stop-dev.sh
+    exit $EXIT_CODE
 }
 trap cleanup EXIT