diff --git a/test/include.am b/test/include.am
index 1648dcc3..930d8422 100644
--- a/test/include.am
+++ b/test/include.am
@@ -107,7 +107,7 @@ test_regress_SOURCES += test/regress_iocp.c
 endif
 
 test_regress_LDADD = $(LIBEVENT_GC_SECTIONS) libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
-test_regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
+test_regress_CPPFLAGS = $(AM_CPPFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS) -Itest
 test_regress_LDFLAGS = $(PTHREAD_CFLAGS)
 
 if OPENSSL
diff --git a/test/rpcgen_wrapper.sh b/test/rpcgen_wrapper.sh
index 0ba5d4f4..aaa03031 100755
--- a/test/rpcgen_wrapper.sh
+++ b/test/rpcgen_wrapper.sh
@@ -37,7 +37,8 @@ fi
 srcdir=$1
 srcdir=${srcdir:-.}
 
-${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
+${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc \
+               test/regress.gen.h test/regress.gen.c
 
 case "$?" in
  0)