diff --git a/psasim/Makefile b/psasim/Makefile
index ec6691f42..a141807b3 100644
--- a/psasim/Makefile
+++ b/psasim/Makefile
@@ -7,7 +7,7 @@ endif
 CLIENT_LIBS := -Lclient_libs -lpsaclient -lmbedtls -lmbedx509 -lmbedcrypto
 SERVER_LIBS := -Lserver_libs -lmbedcrypto
 
-MBEDTLS_ROOT_PATH = ../../..
+MBEDTLS_ROOT_PATH = ../..
 COMMON_INCLUDE := -I./include -I$(MBEDTLS_ROOT_PATH)/include \
                   -I$(MBEDTLS_ROOT_PATH)/tf-psa-crypto/include \
                   -I$(MBEDTLS_ROOT_PATH)/tf-psa-crypto/drivers/builtin/include
diff --git a/scripts/all-core.sh b/scripts/all-core.sh
index e2fe2e177..3197b062a 100644
--- a/scripts/all-core.sh
+++ b/scripts/all-core.sh
@@ -267,7 +267,7 @@ pre_initialize_variables () {
     # defined in this script whose name starts with "component_".
     ALL_COMPONENTS=$(compgen -A function component_ | sed 's/component_//')
 
-    PSASIM_PATH='tests/psa-client-server/psasim/'
+    PSASIM_PATH='framework/psasim/'
 
     # Delay determining SUPPORTED_COMPONENTS until the command line options have a chance to override
     # the commands set by the environment