diff --git a/scripts/build.sh b/scripts/build.sh
index a25a2ed6..3acd64a9 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -2,14 +2,11 @@
 # Copyright (C) 2024, Ava Labs, Inc. All rights reserved.
 # See the file LICENSE for licensing terms.
 
-set -e errexit
-
 # Root directory
 root=$(
     cd "$(dirname "${BASH_SOURCE[0]}")"
     cd .. && pwd
 )
 
-"$root"/scripts/generate.sh
 "$root"/scripts/build_relayer.sh
 "$root"/scripts/build_signature_aggregator.sh
diff --git a/scripts/test.sh b/scripts/test.sh
index a25ba856..7204adca 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -27,12 +27,14 @@ if [ "$HELP" = true ]; then
 fi
 
 # Directory above this script
-RELAYER_PATH=$(
+root=$(
     cd "$(dirname "${BASH_SOURCE[0]}")"
     cd .. && pwd
 )
-source "$RELAYER_PATH"/scripts/constants.sh
+source "$root"/scripts/constants.sh
 
 go build -o tests/cmd/decider/decider ./tests/cmd/decider/
 
+"$root"/scripts/generate.sh
+
 go test -tags testing $VERBOSE ./...