Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,8 +1,8 @@
 include extra.mk
 
-SUBDIRS = src utils ${TESTS}
+SUBDIRS = src utils tests
 DISTCLEAN = Info.plist		\
 	    aclocal.m4		\
 	    autom4te.cache	\
 	    buildsys.mk		\
 	    config.h		\
@@ -10,11 +10,11 @@
 	    config.status	\
 	    extra.mk
 
 include buildsys.mk
 
-utils ${TESTS}: src
+utils tests: src
 
 tarball:
 	echo "Generating tarball for version ${PACKAGE_VERSION}..."
 	rm -fr objfw-${PACKAGE_VERSION} objfw-${PACKAGE_VERSION}.tar \
 		objfw-${PACKAGE_VERSION}.tar.xz

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -945,11 +945,11 @@
 	case "$host" in
 		*-*-mingw*)
 			AC_CHECK_PROG(WINE, wine, wine)
 
 			AS_IF([test x"$WINE" != x""], [
-				AC_SUBST(TESTS, "tests")
+				AC_SUBST(RUN_TESTS, "run")
 				AC_SUBST(TEST_LAUNCHER, "$WINE")
 			])
 			;;
 	esac
 
@@ -958,16 +958,16 @@
 		dnl wiiload and thus likely already set by the user to something
 		dnl that is not the path of the wiiload binary.
 		AC_CHECK_PROG(wiiload, wiiload, wiiload)
 
 		AS_IF([test x"$wiiload" != x""], [
-			AC_SUBST(TESTS, "tests")
+			AC_SUBST(RUN_TESTS, "run")
 			AC_SUBST(TEST_LAUNCHER, "$wiiload")
 		])
 	])
 ], [
-	AC_SUBST(TESTS, "tests")
+	AC_SUBST(RUN_TESTS, "run")
 ])
 
 dnl We don't call AC_PROG_CPP, but only AC_PROG_OBJCPP and set CPP to OBJCPP
 dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
 AC_SUBST(CPP)

Index: extra.mk.in
==================================================================
--- extra.mk.in
+++ extra.mk.in
@@ -41,14 +41,14 @@
 RUNTIME = @RUNTIME@
 RUNTIME_A = @RUNTIME_A@
 RUNTIME_RUNTIME_A = @RUNTIME_RUNTIME_A@
 RUNTIME_RUNTIME_LIB_A = @RUNTIME_RUNTIME_LIB_A@
 RUNTIME_LIB_A = @RUNTIME_LIB_A@
+RUN_TESTS = @RUN_TESTS@
 TESTPLUGIN = @TESTPLUGIN@
-TESTS = @TESTS@
 TESTS_LIBS = @TESTS_LIBS@
 TEST_LAUNCHER = @TEST_LAUNCHER@
 USE_INCLUDES_THREADS = @USE_INCLUDES_THREADS@
 USE_SRCS_FILES = @USE_SRCS_FILES@
 USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@
 USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@
 USE_SRCS_THREADS = @USE_SRCS_THREADS@

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -41,13 +41,17 @@
 	       OFUDPSocketTests.m
 SRCS_THREADS = OFThreadTests.m
 
 IOS_USER ?= mobile
 IOS_TMP ?= /tmp/objfw-test
+
+include ../buildsys.mk
+
+post-all: ${RUN_TESTS}
 
 .PHONY: run run-on-ios run-on-android sign-for-ios
-run: all
+run:
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR}
 	rm -f libobjfw.so.${OBJFW_LIB_MAJOR_MINOR}
 	rm -f libobjfw.dll libobjfw.dylib
 	if test -f ../src/libobjfw.so; then \
 		${LN_S} ../src/libobjfw.so libobjfw.so.${OBJFW_LIB_MAJOR}; \
@@ -109,10 +113,12 @@
 	psp-strip ${PROG_NOINST}
 	pack-pbp $@ PARAM.SFO NULL NULL NULL NULL NULL ${PROG_NOINST} NULL
 
 boot.dol: ${PROG_NOINST}
 	elf2dol ${PROG_NOINST} $@
+
+${PROG_NOINST}: ${LIBOBJFW_DEP}
 
 ${PROG_NOINST}.arm9: ${PROG_NOINST}
 	arm-none-eabi-objcopy -O binary $< $@
 
 ${PROG_NOINST}.nds: ${PROG_NOINST}.arm9
@@ -120,13 +126,9 @@
 	mkdir -p nds-data
 	cp testfile.bin testfile.txt testfile.ini serialization.xml nds-data
 	ndstool -c $@ -9 $< -d nds-data
 	rm -fr nds-data
 
-include ../buildsys.mk
-
-${PROG_NOINST}: ${LIBOBJFW_DEP}
-
 CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
 LIBS := -L../src -lobjfw ${TESTS_LIBS} ${LIBS}
 LDFLAGS += ${MAP_LDFLAGS}
 LD = ${OBJC}