diff --git a/Makefile b/Makefile
index a08d89ea..fa97bfa0 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,9 @@ else
 include config-unix.mk
 endif
 
+TESTS=test/echo-server.c test/test-*.c
+BENCHMARKS=test/echo-server.c test/benchmark-*.c
+
 all: uv.a test/run-tests test/run-benchmarks
 
 test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
diff --git a/config-mingw.mk b/config-mingw.mk
index 0642960a..054e1ce2 100644
--- a/config-mingw.mk
+++ b/config-mingw.mk
@@ -26,8 +26,6 @@ E=.exe
 
 CFLAGS=-g --std=gnu89
 LINKFLAGS=-lm
-TESTS=test/echo-server.c test/test-*.c
-BENCHMARKS=test/echo-server.c test/benchmark-*.c
 
 RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup?
 RUNNER_LINKFLAGS=$(LINKFLAGS)
diff --git a/config-unix.mk b/config-unix.mk
index 6903824e..bddd8fc1 100644
--- a/config-unix.mk
+++ b/config-unix.mk
@@ -23,14 +23,14 @@ AR = $(PREFIX)ar
 E=
 CFLAGS=--std=gnu89 -g
 LINKFLAGS=-lm
-TESTS=test/echo-server.c test/test-*.c
-BENCHMARKS=test/echo-server.c test/benchmark-*.c
 
 ifeq (SunOS,$(uname_S))
 LINKFLAGS+=-lsocket -lnsl
 endif
 
-RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup?
+# Need _GNU_SOURCE for strdup?
+RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE -DEV_MULTIPLICITY=0
+
 RUNNER_LINKFLAGS=$(LINKFLAGS) -pthread
 RUNNER_LIBS=
 RUNNER_SRC=test/runner-unix.c
@@ -45,7 +45,7 @@ ev/ev.o: ev/config.h ev/ev.c
 	$(MAKE) -C ev
 
 ev/config.h:
-	cd ev && ./configure
+	cd ev && CPPFLAGS=-DEV_MULTIPLICITY=0 ./configure
 
 clean-platform:
 	$(MAKE) -C ev clean