diff --git a/Makefile.fips b/Makefile.fips
index 52aa542a46..245b5922dd 100644
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -522,8 +522,8 @@ files:
 links:
 	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
 	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-	$(MAKE) -C fips links
-	SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
+	$(BUILDENV) $(MAKE) -C fips links
+	$(BUILDENV) SDIRS='$(LINKDIRS)' $(MAKE) -C crypto links
 
 gentests:
 	@(cd test && echo "generating dummy tests (if needed)..." && \
diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index bae87dd755..4b809c0c89 100644
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -65,7 +65,7 @@ files:
 links:
 	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
 	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	cp $(TESTDATA) ../../test
+	[ ! -f $(TESTDATA) ] || cp $(TESTDATA) ../../test
 	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install: