diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 7caebd5dc..00dc9ca2e 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -147,6 +147,10 @@ EOF
 # remove built files as well as the cmake cache/config
 cleanup()
 {
+    if [ -n "${MBEDTLS_ROOT_DIR+set}" ]; then
+        cd "$MBEDTLS_ROOT_DIR"
+    fi
+
     command make clean
 
     # Remove CMake artefacts
@@ -857,6 +861,7 @@ msg "test: cmake 'out-of-source' build"
 make test
 cd "$MBEDTLS_ROOT_DIR"
 rm -rf "$OUT_OF_SOURCE_DIR"
+unset MBEDTLS_ROOT_DIR