diff --git a/test/Makefile.am b/test/Makefile.am
index 41a6b0be..0d9ea53e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 LDADD = -L.. -levent
 CPPFPLAGS = -I.. 
-CFLAGS = -I../compat -g -Wall
+CFLAGS = -I../compat -Wall @CFLAGS@
 
 noinst_PROGRAMS = test-eof test-weof test-time regress bench
 
@@ -47,3 +47,4 @@ test: test-eof test-weof test-time regress
 		echo FAILED ; \
 	fi
 
+bench test-eof test-weof test-time regress: ../libevent.a
diff --git a/test/test-eof.c b/test/test-eof.c
index 93d3b639..020c6611 100644
--- a/test/test-eof.c
+++ b/test/test-eof.c
@@ -27,7 +27,7 @@ read_cb(int fd, short event, void *arg)
 
 	len = read(fd, buf, sizeof(buf));
 
-	printf("%s: read %d%s\n", __FUNCTION__,
+	printf("%s: read %d%s\n", __func__,
 	    len, len ? "" : " - means EOF");
 
 	if (len) {
diff --git a/test/test-weof.c b/test/test-weof.c
index 66340393..8862b4a2 100644
--- a/test/test-weof.c
+++ b/test/test-weof.c
@@ -29,7 +29,7 @@ write_cb(int fd, short event, void *arg)
 
 	len = write(fd, test, strlen(test) + 1);
 
-	printf("%s: write %d%s\n", __FUNCTION__,
+	printf("%s: write %d%s\n", __func__,
 	    len, len ? "" : " - means EOF");
 
 	if (len > 0) {