diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 082c0657b..64f5ff9c9 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -166,7 +166,8 @@ jobs:
     needs: changes
     if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'java-grpc')}}
     with:
-      java: 17, 21
+      # Can't test with Java 21+ currently because of https://github.com/lightbend/ssl-config/issues/367
+      java: 17
       scala: 2.13.x, 3.x
       gradle-build-root: play-java-grpc-example
       add-dimensions: >-
@@ -362,7 +363,8 @@ jobs:
     needs: changes
     if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'scala-grpc')}}
     with:
-      java: 17, 21
+      # Can't test with Java 21+ currently because of https://github.com/lightbend/ssl-config/issues/367
+      java: 17
       scala: 2.13.x, 3.x
       gradle-build-root: play-scala-grpc-example
       add-dimensions: >-
diff --git a/test.sh b/test.sh
index e885e0e9d..5bd2a8b2a 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
+
+# -e          Exit script immediately if any command returns a non-zero exit status.
+# -u          Exit script immediately if an undefined variable is used.
+# -o pipefail Ensure Bash pipelines return a non-zero status if any of the commands fail,
+#             rather than returning the exit status of the last command in the pipeline.
+set -euo pipefail
+
 if [ -z "$MATRIX_SCALA" ]; then
     echo "Error: the environment variable MATRIX_SCALA is not set"
     exit 1