diff --git a/scripts/common.make b/scripts/common.make
index cc63bb7e77..0082bd98ee 100644
--- a/scripts/common.make
+++ b/scripts/common.make
@@ -15,7 +15,8 @@ ifndef MBEDTLS_PATH
 MBEDTLS_PATH := ..
 endif
 
-PSASIM_PATH=$(MBEDTLS_PATH)/tests/psa-client-server/psasim
+PSASIM_PATH?=$(abspath $(MBEDTLS_PATH)/framework/psasim)
+
 
 ifeq (,$(wildcard $(MBEDTLS_PATH)/framework/exported.make))
     # Use the define keyword to get a multi-line message.
diff --git a/tests/Makefile b/tests/Makefile
index b24c4ef9e2..45d12b72de 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -196,7 +196,7 @@ $(CRYPTO_BINARIES): %$(EXEXT): %.c $(MBEDLIBS) $(TEST_OBJS_DEPS) $(MBEDTLS_TEST_
 
 clean:
 ifndef WINDOWS
-	$(MAKE) -C psa-client-server/psasim clean
+	$(MAKE) -C $(PSASIM_PATH) clean
 	rm -rf $(BINARIES) *.c *.datax
 	rm -rf $(CRYPTO_BINARIES) ../tf-psa-crypto/tests/*.c ../tf-psa-crypto/tests/*.datax
 	rm -f src/*.o src/test_helpers/*.o src/libmbed*