Index: test/run-stp-tests.sh
--- test/run-stp-tests.sh.orig
+++ test/run-stp-tests.sh
@@ -32,7 +32,7 @@ umask 022
 # Make the IPP test program...
 #
 
-make
+${MAKE_PROGRAM}
 
 #
 # Solaris has a non-POSIX grep in /bin...
@@ -593,7 +593,7 @@ if test -f "$root/cups/libcups.so.2"; then
 		LD_LIBRARY_PATH="$root/cups:$LD_LIBRARY_PATH"
 	fi
 
-	LD_PRELOAD="$root/cups/libcups.so.2:$root/cups/libcupsimage.so.2"
+	LD_PRELOAD="$root/cups/libcups.so.${LIBcups_VERSION}:$root/cups/libcupsimage.so.${LIBcupsimage_VERSION}"
 	if test `uname` = SunOS -a -r /usr/lib/libCrun.so.1; then
 		LD_PRELOAD="/usr/lib/libCrun.so.1:$LD_PRELOAD"
 	fi