Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -9,11 +9,10 @@
        OFListObject.m		\
        OFObject.m		\
        OFString.m		\
        OFWideString.m
 
-OBJCFLAGS += -fPIC -DPIC -fno-nil-recivers -fconstant-string-class=OFConstString -fobjc-exceptions
 INCLUDES = OFConstString.h	\
 	   OFConstWideString.h	\
 	   OFException.h	\
 	   OFList.h		\
 	   OFListObject.h	\
@@ -21,7 +20,8 @@
 	   OFString.h		\
 	   OFWideString.h
 
 include ../buildsys.mk
 
+OBJCFLAGS += -fPIC -DPIC -fno-nil-receivers -fconstant-string-class=OFConstString -fobjc-exceptions
 LD = ${OBJC}
 LIBS += -lobjc

Index: tests/OFList/Makefile
==================================================================
--- tests/OFList/Makefile
+++ tests/OFList/Makefile
@@ -2,11 +2,15 @@
 SRCS = OFList.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src
+OBJCFLAGS += -fno-nil-receivers -fconstant-string-class=OFConstString -fobjc-exceptions
 LIBS += -lobjc -L../../src -lobjfw
 
-all: ${PROG_NOINST}
-	LD_LIBRARY_PATH=../../src \
+.PHONY: run
+
+all: run
+run: ${PROG_NOINST}
+	LD_PRELOAD=../../src/libobjfw.so \
 	DYLD_LIBRARY_PATH=../../src \
 	./${PROG_NOINST}

Index: tests/OFObject/Makefile
==================================================================
--- tests/OFObject/Makefile
+++ tests/OFObject/Makefile
@@ -2,11 +2,15 @@
 SRCS = OFObject.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src
+OBJCFLAGS += -fno-nil-receivers -fconstant-string-class=OFConstString -fobjc-exceptions
 LIBS += -lobjc -L../../src -lobjfw
 
-all: ${PROG_NOINST}
-	LD_LIBRARY_PATH=../../src \
+.PHONY: run
+
+all: run
+run: ${PROG_NOINST}
+	LD_PRELOAD=../../src/libobjfw.so \
 	DYLD_LIBRARY_PATH=../../src \
 	./${PROG_NOINST}

Index: tests/OFString/Makefile
==================================================================
--- tests/OFString/Makefile
+++ tests/OFString/Makefile
@@ -2,11 +2,15 @@
 SRCS = OFString.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src
+OBJCFLAGS += -fno-nil-receivers -fconstant-string-class=OFConstString -fobjc-exceptions
 LIBS += -lobjc -L../../src -lobjfw
 
-all: ${PROG_NOINST}
-	LD_LIBRARY_PATH=../../src \
+.PHONY: run
+
+all: run
+run: ${PROG_NOINST}
+	LD_PRELOAD=../../src/libobjfw.so \
 	DYLD_LIBRARY_PATH=../../src \
 	./${PROG_NOINST}

Index: tests/OFWideString/Makefile
==================================================================
--- tests/OFWideString/Makefile
+++ tests/OFWideString/Makefile
@@ -2,11 +2,15 @@
 SRCS = OFWideString.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src
+OBJCFLAGS += -fno-nil-receivers -fconstant-string-class=OFConstString -fobjc-exceptions
 LIBS += -lobjc -L../../src -lobjfw
 
-all: ${PROG_NOINST}
-	LD_LIBRARY_PATH=../../src \
+.PHONY: run
+
+all: run
+run: ${PROG_NOINST}
+	LD_PRELOAD=../../src/libobjfw.so \
 	DYLD_LIBRARY_PATH=../../src \
 	./${PROG_NOINST}