Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -77,13 +77,27 @@
 test x"$ac_cv_have_ipv6" = x"yes" && \
 	AC_DEFINE(HAVE_IPV6, 1, "Whether we have IPv6 support")
 
 test x"$GCC" = x"yes" && CFLAGS="$CFLAGS -Werror -pipe -g"
 test x"$GCC" = x"yes" && OBJCFLAGS="$OBJCFLAGS -Werror -pipe -g"
-test x"$cross_compiling" != x"yes" && AC_SUBST(TESTS, "tests")
+
+if test x"$cross_compiling" = x"yes"; then
+	case "$target" in
+		*-*-mingw*)
+			AC_PATH_PROG(WINE, wine)
+
+			if test x"$WINE" != "x"; then
+				AC_SUBST(TESTS, "tests")
+				AC_SUBST(TEST_LAUNCHER, "$WINE")
+			fi
+			;;
+	esac
+else
+	AC_SUBST(TESTS, "tests")
+fi
 
 BUILDSYS_TOUCH_DEPS
 
 AC_SUBST(PACKAGE, objfw)
 AC_CONFIG_FILES([buildsys.mk extra.mk])
 AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -1,4 +1,5 @@
 ASPRINTF = @ASPRINTF@
-TESTS = @TESTS@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+TESTS = @TESTS@
+TEST_LAUNCHER = @TEST_LAUNCHER@

Index: tests/OFArray/Makefile
==================================================================
--- tests/OFArray/Makefile
+++ tests/OFArray/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = ofarray${PROG_SUFFIX}
 SRCS = OFArray.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT

Index: tests/OFHashes/Makefile
==================================================================
--- tests/OFHashes/Makefile
+++ tests/OFHashes/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = ofhashes${PROG_SUFFIX}
 SRCS = OFHashes.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT

Index: tests/OFList/Makefile
==================================================================
--- tests/OFList/Makefile
+++ tests/OFList/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = oflist${PROG_SUFFIX}
 SRCS = OFList.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT

Index: tests/OFObject/Makefile
==================================================================
--- tests/OFObject/Makefile
+++ tests/OFObject/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = ofobject${PROG_SUFFIX}
 SRCS = OFObject.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT

Index: tests/OFString/Makefile
==================================================================
--- tests/OFString/Makefile
+++ tests/OFString/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = ofstring${PROG_SUFFIX}
 SRCS = OFString.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT

Index: tests/OFTCPSocket/Makefile
==================================================================
--- tests/OFTCPSocket/Makefile
+++ tests/OFTCPSocket/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = oftcpsocket${PROG_SUFFIX}
 SRCS = OFTCPSocket.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT

Index: tests/OFXMLFactory/Makefile
==================================================================
--- tests/OFXMLFactory/Makefile
+++ tests/OFXMLFactory/Makefile
@@ -1,9 +1,10 @@
 PROG_NOINST = ofxmlfactory${PROG_SUFFIX}
 SRCS = OFXMLFactory.m
 
 include ../../buildsys.mk
+include ../../extra.mk
 
 CPPFLAGS += -I../../src -I../..
 LIBS += -lobjc -L../../src -lobjfw
 
 .PHONY: run
@@ -15,8 +16,8 @@
 	ln -s ../../src/libobjfw.so libobjfw.so.1.0
 	ln -s ../../src/libobjfw.dll libobjfw.dll
 	ln -s ../../src/libobjfw.dylib libobjfw.dylib
 	LD_LIBRARY_PATH=.$${LD_LIBRARY_PATH+:}$$LD_LIBRARY_PATH \
 	DYLD_LIBRARY_PATH=.$${DYLD_LIBRARY_PATH+:}$$DYLD_LIBRARY_PATH \
-	./${PROG_NOINST}; EXIT=$$?; \
+	${TEST_LAUNCHER} ./${PROG_NOINST}; EXIT=$$?; \
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib; \
 	exit $$EXIT