diff --git a/.github/workflows/test-cargo.yml b/.github/workflows/test-cargo.yml
index e6c9f323b1f..8d414daa75b 100644
--- a/.github/workflows/test-cargo.yml
+++ b/.github/workflows/test-cargo.yml
@@ -1,9 +1,16 @@
 name: Test cargo
 
 on:
+  pull_request:
+  merge_group:
   push:
     branches:
-      - 'master'
+      - master
+
+# This will cancel previous runs when a branch or PR is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   build:
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
index 07e5a4d5426..2f29e027156 100644
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@@ -1,9 +1,17 @@
 name: Test JS packages
 
 on:
+  pull_request:
+  merge_group:
   push:
     branches:
-      - 'master'
+      - master
+
+# This will cancel previous runs when a branch or PR is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}
+  cancel-in-progress: true
+
 
 jobs:
   build:
diff --git a/scripts/bootstrap_native.sh b/scripts/bootstrap_native.sh
index 693a9d9678e..481c76a263e 100755
--- a/scripts/bootstrap_native.sh
+++ b/scripts/bootstrap_native.sh
@@ -13,4 +13,4 @@ else
 fi
 
 # Build native.
-cargo build --features="noirc_driver/aztec" --release
+cargo build --release
diff --git a/scripts/bootstrap_packages.sh b/scripts/bootstrap_packages.sh
index 5fce2675037..233aed7a039 100755
--- a/scripts/bootstrap_packages.sh
+++ b/scripts/bootstrap_packages.sh
@@ -14,8 +14,6 @@ else
   export GIT_COMMIT=$(git rev-parse --verify HEAD)
 fi
 
-export cargoExtraArgs="--features noirc_driver/aztec"
-
 yarn
 yarn build
 
diff --git a/scripts/test_js_packages.sh b/scripts/test_js_packages.sh
index a54e581b1c9..a5ec5b92a70 100755
--- a/scripts/test_js_packages.sh
+++ b/scripts/test_js_packages.sh
@@ -14,9 +14,7 @@ else
   export GIT_COMMIT=$(git rev-parse --verify HEAD)
 fi
 
-export cargoExtraArgs="--features noirc_driver/aztec"
-
-cargo build --features="noirc_driver/aztec" --release
+cargo build --release
 export PATH="${PATH}:/usr/src/noir/target/release/"
 
 yarn