diff --git a/.github/workflows/wc-integration-test-docker.yml b/.github/workflows/wc-integration-test-docker.yml
index 88724d36..dac5b143 100644
--- a/.github/workflows/wc-integration-test-docker.yml
+++ b/.github/workflows/wc-integration-test-docker.yml
@@ -54,9 +54,7 @@ jobs:
           persist-credentials: false
       - run: echo "arch=$(echo "${RUNNER_ARCH}" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"
         id: runner-arch
-      - run: |
-          set -Eeuo pipefail
-          bats --formatter junit "${TEST_FILE}" | tee "test-report-${IMAGE_BASENAME}-${RUNNER_ARCH}.xml"
+      - run: bats --formatter junit "${TEST_FILE}" | tee "test-report-${IMAGE_BASENAME}-${RUNNER_ARCH}.xml"
         env:
           IMAGE_BASENAME: ${{ inputs.image-basename }}
           TEST_FILE: ${{ inputs.test-file }}
diff --git a/.github/workflows/wc-integration-test-podman.yml b/.github/workflows/wc-integration-test-podman.yml
index 8aae7671..a06b73a6 100644
--- a/.github/workflows/wc-integration-test-podman.yml
+++ b/.github/workflows/wc-integration-test-podman.yml
@@ -68,8 +68,6 @@ jobs:
         id: runner-arch
       - name: Run integration tests using Podman
         run: |
-          set -Eeuo pipefail
-
           podman run --rm \
             --network=host \
             -v "${WORKSPACE}:${WORKSPACE}" \
diff --git a/package-lock.json b/package-lock.json
index f090bbe7..21814a05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "devDependencies": {
         "@playwright/test": "^1.58.2",
-        "@types/node": "^25.3.5",
+        "@types/node": "^25.5.0",
         "dotenv": "^17.3.1",
         "nodemon": "^3.1.14",
         "otpauth": "^9.5.0",
@@ -237,9 +237,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "25.3.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.5.tgz",
-      "integrity": "sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz",
+      "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 8d89b110..a5aa4899 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "devDependencies": {
     "@playwright/test": "^1.58.2",
-    "@types/node": "^25.3.5",
+    "@types/node": "^25.5.0",
     "dotenv": "^17.3.1",
     "nodemon": "^3.1.14",
     "otpauth": "^9.5.0",
diff --git a/test/cpp/integration-tests.bats b/test/cpp/integration-tests.bats
index fd6cfd2f..49a6f676 100644
--- a/test/cpp/integration-tests.bats
+++ b/test/cpp/integration-tests.bats
@@ -34,7 +34,7 @@ teardown() {
 
   for TOOL in clang clang++ clang-cl clang-format clang-tidy; do
     INSTALLED_VERSION=$($TOOL --version | to_semver)
-    assert_equal_print "$EXPECTED_VERSION" "$INSTALLED_VERSION" "Tool '${TOOL}' version"
+    assert_equal $INSTALLED_VERSION $EXPECTED_VERSION
   done
 }
 
@@ -44,7 +44,7 @@ teardown() {
 
   for TOOL in cc gcc c++ g++ gcov; do
     INSTALLED_VERSION=$($TOOL --version | to_semver)
-    assert_equal_print "$EXPECTED_VERSION" "$INSTALLED_VERSION" "Tool '${TOOL}' version"
+    assert_equal "$INSTALLED_VERSION" "$EXPECTED_VERSION"
   done
 }
 
@@ -52,23 +52,30 @@ teardown() {
 @test "host and embedded gcc toolchain versions should be the same major and minor version" {
   EXPECTED_MAJOR_MINOR_VERSION=$(get_expected_semver_for g++ | cut -d. -f1,2)
   INSTALLED_MAJOR_MINOR_VERSION=$(arm-none-eabi-gcc -dumpfullversion | cut -d. -f1,2)
-  assert_equal_print "$EXPECTED_MAJOR_MINOR_VERSION" "$INSTALLED_MAJOR_MINOR_VERSION" "Host and ARM GCC major and minor version"
+  assert_equal "$INSTALLED_MAJOR_MINOR_VERSION" "$EXPECTED_MAJOR_MINOR_VERSION"
 }
 
 # bats test_tags=Compatibility,Version,Tools
 @test "supporting tool versions should be aligned with expected versions" {
-  for TOOL in gdb gdb-multiarch git ninja; do
+  for TOOL in gdb gdb-multiarch; do
+    EXPECTED_VERSION=$(get_expected_version_for ${TOOL})
+    INSTALLED_VERSION=$(${TOOL} --version | grep -o '[0-9]\+\.[0-9]\+' | head -n1)
+
+    assert_equal "$INSTALLED_VERSION" "$EXPECTED_VERSION"
+  done
+
+  for TOOL in git ninja; do
     EXPECTED_VERSION=$(get_expected_semver_for ${TOOL})
     INSTALLED_VERSION=$(${TOOL} --version | to_semver)
 
-    assert_equal_print "$EXPECTED_VERSION" "$INSTALLED_VERSION" "Tool '${TOOL}' version"
+    assert_equal "$INSTALLED_VERSION" "$EXPECTED_VERSION"
   done
 
   for TOOL in cmake conan; do
     EXPECTED_VERSION=$(cat ${BATS_TEST_DIRNAME}/../../.devcontainer/cpp/requirements.in | grep ${TOOL} | to_semver)
     INSTALLED_VERSION=$(${TOOL} --version | to_semver)
 
-    assert_equal_print "$EXPECTED_VERSION" "$INSTALLED_VERSION" "Tool '${TOOL}' version"
+    assert_equal "$INSTALLED_VERSION" "$EXPECTED_VERSION"
   done
 }
 
@@ -300,12 +307,3 @@ function install_win_sdk_when_ci_set() {
     install_win_sdk
   fi
 }
-
-function assert_equal_print() {
-  local EXPECTED=${1:?}
-  local ACTUAL=${2:?}
-  local MESSAGE=${3:-"Expecting values to be equal"}
-
-  echo "# ${MESSAGE} expected(${EXPECTED}) actual(${ACTUAL})" >&3
-  assert_equal ${ACTUAL} ${EXPECTED}
-}