diff --git a/testing/lib/log_analysis.py b/testing/lib/log_analysis.py
index 549d63c..ffa33bb 100644
--- a/testing/lib/log_analysis.py
+++ b/testing/lib/log_analysis.py
@@ -176,7 +176,7 @@ def _analyze_lines(result: AnalysisResult, source: str, log_text: str):
         # Discovery
         if "Initiating LookupRequest" in line or "Discovery lookup initiated" in line:
             result.discovery_initiated.append((source, line))
-        if "proof verified, caching route" in line:
+        if "proof verified, route cached" in line:
             result.discovery_succeeded.append((source, line))
         if "target not in any peer bloom filter" in line:
             result.discovery_bloom_miss.append((source, line))
diff --git a/testing/scripts/build.sh b/testing/scripts/build.sh
index c122546..9a1e3b5 100755
--- a/testing/scripts/build.sh
+++ b/testing/scripts/build.sh
@@ -46,13 +46,11 @@ if [ "$UNAME_S" = "Darwin" ]; then
 
     echo "Building FIPS for Linux (release) using cargo-zigbuild..."
     cargo zigbuild --release --target "$CARGO_TARGET" --manifest-path="$PROJECT_ROOT/Cargo.toml"
-    cargo zigbuild --release --target "$CARGO_TARGET" --manifest-path="$PROJECT_ROOT/Cargo.toml" --features gateway --bin fips-gateway
 
     TARGET_DIR="$PROJECT_ROOT/target/$CARGO_TARGET/release"
 else
     echo "Building FIPS (release)..."
     cargo build --release --manifest-path="$PROJECT_ROOT/Cargo.toml"
-    cargo build --release --manifest-path="$PROJECT_ROOT/Cargo.toml" --features gateway --bin fips-gateway
 
     TARGET_DIR="$PROJECT_ROOT/target/release"
 fi
diff --git a/testing/static/scripts/rekey-test.sh b/testing/static/scripts/rekey-test.sh
index 1c91842..b225da3 100755
--- a/testing/static/scripts/rekey-test.sh
+++ b/testing/static/scripts/rekey-test.sh
@@ -60,7 +60,7 @@ trap 'echo ""; echo "Test interrupted"; exit 130' INT
 
 # Wait times derived from rekey timer
 BASELINE_CONVERGENCE_TIMEOUT=36
-REKEY_SETTLE=5         # settle time after rekey for cutover to complete
+REKEY_SETTLE=12        # > DRAIN_WINDOW_SECS (10) so post-rekey samples are off the old session
 # First FMP rekey should follow shortly after the 35s interval once the mesh is
 # fully converged. Keep this bounded to preserve a meaningful scheduling check
 # while still allowing for log visibility at the timeout edge.