diff --git a/programs/Makefile b/programs/Makefile
index 6c9d4d7342..47745de052 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -101,7 +101,7 @@ SSL_OPT_APPS += test/query_compile_time_config test/udp_proxy
 ssl-opt: $(patsubst %,%$(EXEXT),$(SSL_OPT_APPS))
 .PHONY: ssl-opt
 
-fuzz: ${MBEDTLS_TEST_OBJS}
+fuzz: ${MBEDLIBS} ${MBEDTLS_TEST_OBJS}
 	$(MAKE) -C fuzz
 
 ${MBEDTLS_TEST_OBJS}:
diff --git a/scripts/common.make b/scripts/common.make
index b3d028ff62..c0e7b1d966 100644
--- a/scripts/common.make
+++ b/scripts/common.make
@@ -140,7 +140,7 @@ endif
 default: all
 
 $(MBEDLIBS):
-	$(MAKE) -C $(MBEDTLS_PATH)/library
+	$(MAKE) -C $(MBEDTLS_PATH)/library $(@F)
 
 neat: clean
 ifndef WINDOWS