Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1507,11 +1507,11 @@
 		*-*-mingw*)
 			AC_CHECK_PROG(WINE, wine, wine)
 
 			AS_IF([test x"$WINE" != x""], [
 				AC_SUBST(RUN_TESTS, "run")
-				AC_SUBST(TEST_LAUNCHER, "$WINE")
+				AC_SUBST(WRAPPER, "$WINE")
 			])
 			;;
 	esac
 
 	AS_IF([test x"$with_wii" = x"yes"], [
@@ -1520,11 +1520,11 @@
 		dnl that is not the path of the wiiload binary.
 		AC_CHECK_PROG(wiiload, wiiload, wiiload)
 
 		AS_IF([test x"$wiiload" != x""], [
 			AC_SUBST(RUN_TESTS, "run")
-			AC_SUBST(TEST_LAUNCHER, "$wiiload")
+			AC_SUBST(WRAPPER, "$wiiload")
 		])
 	])
 ], [
 	AC_SUBST(RUN_TESTS, "run")
 ])

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -56,13 +56,13 @@
 RUNTIME_LIBS = @RUNTIME_LIBS@
 RUN_TESTS = @RUN_TESTS@
 TESTPLUGIN = @TESTPLUGIN@
 TESTS_LIBS = @TESTS_LIBS@
 TESTS_OBJCFLAGS = @TESTS_OBJCFLAGS@
-TEST_LAUNCHER = @TEST_LAUNCHER@
 UNICODE_M = @UNICODE_M@
 USE_INCLUDES_ATOMIC = @USE_INCLUDES_ATOMIC@
 USE_SRCS_FILES = @USE_SRCS_FILES@
 USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@
 USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@
 USE_SRCS_THREADS = @USE_SRCS_THREADS@
 WEAK_NSFOUNDATIONVERSIONNUMBER = @WEAK_NSFOUNDATIONVERSIONNUMBER@
+WRAPPER = @WRAPPER@

Index: generators/Makefile
==================================================================
--- generators/Makefile
+++ generators/Makefile
@@ -24,11 +24,11 @@
 			libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	fi
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \
-	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
+	${WRAPPER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	exit $$EXIT
 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -99,11 +99,11 @@
 	fi
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
 	LIBRARY_PATH=.$${LIBRARY_PATH+:}$$LIBRARY_PATH \
 	ASAN_OPTIONS=allocator_may_return_null=1 \
-	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
+	${WRAPPER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}; \
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR} libobjfw.dll; \
 	rm -f libobjfw.${OBJFW_LIB_MAJOR}.dylib; \
 	rm -f libobjfw-rt.so.${OBJFW_RT_LIB_MAJOR}; \
 	rm -f libobjfw-rt.so.${OBJFW_RT_LIB_MAJOR_MINOR} libobjfw-rt.dll; \
@@ -125,11 +125,11 @@
 	    ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/
 	scp -q plugin/TestPlugin.bundle \
 	    ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/plugin/
 	echo "Running tests binary on iOS device ${IOS_HOST}..."
 	ssh ${IOS_USER}@${IOS_HOST} \
-	    'cd ${IOS_TMP} && DYLD_LIBRARY_PATH=. ${TEST_LAUNCHER} ./tests'
+	    'cd ${IOS_TMP} && DYLD_LIBRARY_PATH=. ${WRAPPER} ./tests'
 
 run-on-android: all
 	echo "Uploading files to Android device..."
 	if test -f ../src/libobjfw.so; then \
 		adb push ../src/libobjfw.so \
@@ -147,11 +147,11 @@
 	if test -f plugin/TestPlugin.so; then \
 		adb push plugin/TestPlugin.so \
 		    /data/local/tmp/objfw/plugin/TestPlugin.so; \
 	fi
 	echo "Running tests binary on Android device..."
-	adb shell 'cd /data/local/tmp/objfw && LD_LIBRARY_PATH=. exec ./tests'
+	adb shell 'cd /data/local/tmp/objfw && LD_LIBRARY_PATH=. exec ${WRAPPER} ./tests'
 
 EBOOT.PBP: ${PROG_NOINST}
 	psp-fixup-imports ${PROG_NOINST}
 	mksfo "ObjFW Tests" PARAM.SFO
 	psp-strip ${PROG_NOINST}