Index: tests/OFArray/Makefile
==================================================================
--- tests/OFArray/Makefile
+++ tests/OFArray/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = ofarray
+PROG_NOINST = ofarray${PROG_SUFFIX}
 SRCS = OFArray.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib

Index: tests/OFHashes/Makefile
==================================================================
--- tests/OFHashes/Makefile
+++ tests/OFHashes/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = ofhashes
+PROG_NOINST = ofhashes${PROG_SUFFIX}
 SRCS = OFHashes.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib

Index: tests/OFList/Makefile
==================================================================
--- tests/OFList/Makefile
+++ tests/OFList/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = oflist
+PROG_NOINST = oflist${PROG_SUFFIX}
 SRCS = OFList.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib

Index: tests/OFObject/Makefile
==================================================================
--- tests/OFObject/Makefile
+++ tests/OFObject/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = ofobject
+PROG_NOINST = ofobject${PROG_SUFFIX}
 SRCS = OFObject.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib

Index: tests/OFString/Makefile
==================================================================
--- tests/OFString/Makefile
+++ tests/OFString/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = ofstring
+PROG_NOINST = ofstring${PROG_SUFFIX}
 SRCS = OFString.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib

Index: tests/OFTCPSocket/Makefile
==================================================================
--- tests/OFTCPSocket/Makefile
+++ tests/OFTCPSocket/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = oftcpsocket
+PROG_NOINST = oftcpsocket${PROG_SUFFIX}
 SRCS = OFTCPSocket.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib

Index: tests/OFXMLFactory/Makefile
==================================================================
--- tests/OFXMLFactory/Makefile
+++ tests/OFXMLFactory/Makefile
@@ -1,6 +1,6 @@
-PROG_NOINST = ofxmlfactory
+PROG_NOINST = ofxmlfactory${PROG_SUFFIX}
 SRCS = OFXMLFactory.m
 
 include ../../buildsys.mk
 
 CPPFLAGS += -I../../src -I../..
@@ -11,10 +11,11 @@
 all: run
 run: ${PROG_NOINST}
 	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
 	ln -s ../../src/libobjfw.so libobjfw.so.1
 	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}
-	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dylib
+	rm -f libobjfw.so.1 libobjfw.so.1.0 libobjfw.dll libobjfw.dylib