diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 83d08f300..934de0acd 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -214,7 +214,7 @@ $(sort $(DIRECTORY_TARGETS)):
 	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
+$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS) $(TESTSHRLIBNAME)
 
 # Install built libraries too, unless Makefile says to wait
 ifneq ($(DELAY_INSTALL_LIBS),YES)
diff --git a/epics-base.spec b/epics-base.spec
index 8cff24364..7a02b1912 100644
--- a/epics-base.spec
+++ b/epics-base.spec
@@ -187,7 +187,7 @@ git submodule update --init --recursive modules
 %if %{defined epics_host_arch}
 export EPICS_HOST_ARCH=%{epics_host_arch}
 %endif
-%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} FINAL_LOCATION=%{prog_folder}
+%make_build INSTALL_LOCATION=%{buildroot}%{prog_folder} FINAL_LOCATION=%{prog_folder}
 %{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} copysrc
 
 # remove files we do not need
@@ -210,7 +210,7 @@ shopt -s extglob
 # and install will delete our buildroot!
 
 %clean
-%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} realclean
+%make_build INSTALL_LOCATION=%{buildroot}%{prog_folder} realclean
 %{__rm} -f modules/RELEASE.*.local
 %{__rm} -rf %{buildroot}
 %{__cp} %{_rpmdir}/*/%{name}*%{version}-%{release}.*.rpm %{_sourcedir}