diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 61b17e102..6249977c8 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -267,10 +267,6 @@ 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
@@ -2603,7 +2599,6 @@ component_test_cmake_out_of_source () {
     rm ssl-opt.err
     cd "$MBEDTLS_ROOT_DIR"
     rm -rf "$OUT_OF_SOURCE_DIR"
-    unset MBEDTLS_ROOT_DIR
 }
 
 component_test_cmake_as_subdirectory () {