diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 4dae6f0c3..25403a879 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -69,6 +69,14 @@ function gp2_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn
 
+    # Workaround for error caused by the last release of hardhat-waffle@2.0.6 that bumps ethereum-waffle
+    # to version 4.0.10 and breaks gp2 build with the following error:
+    #
+    #  Cannot find module 'ethereum-waffle/dist/cjs/src/deployContract'
+    #
+    # See: https://github.com/NomicFoundation/hardhat-waffle/commit/83ee9cb36ee59d0bedacbbd00043f030af104ad0
+    yarn add '@nomiclabs/hardhat-waffle@2.0.5'
+
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/
 
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 99c7c2716..614c285f7 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -96,6 +96,14 @@ function prb_math_test
     yarn install --no-lock-file
     yarn add hardhat-gas-reporter
 
+    # Workaround for error caused by the last release of hardhat-waffle@2.0.6 that bumps ethereum-waffle
+    # to version 4.0.10 and breaks prb-math build with the following error:
+    #
+    #  Cannot find module 'ethereum-waffle/dist/cjs/src/deployContract'
+    #
+    # See: https://github.com/NomicFoundation/hardhat-waffle/commit/83ee9cb36ee59d0bedacbbd00043f030af104ad0
+    yarn add '@nomiclabs/hardhat-waffle@2.0.5'
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do