diff --git a/scripts/all-core.sh b/scripts/all-core.sh
index 57bf8ffdc..7046bec50 100644
--- a/scripts/all-core.sh
+++ b/scripts/all-core.sh
@@ -948,11 +948,7 @@ run_component () {
         "${dd_cmd[@]}"
     fi
 
-    # Since building TF-PSA-Crypto is out of source, we cannot identify if we
-    # are in TF-PSA-Crypto repository. We set running_tf_psa_crypto_test.
-    running_tf_psa_crypto_test=0
     if in_tf_psa_crypto_repo; then
-        running_tf_psa_crypto_test=1
         pre_create_tf_psa_crypto_out_of_source_directory
     fi
 
@@ -989,11 +985,6 @@ run_component () {
         fi
     fi
 
-    # Reset working directory to TF_PSA_Crypto as it is build out of source..
-    if [ $running_tf_psa_crypto_test -eq 1 ]; then
-        cd "$TF_PSA_CRYPTO_ROOT_DIR"
-    fi
-
     # Restore the build tree to a clean state.
     cleanup
     unset current_component