diff --git a/test/Makefile.am b/test/Makefile.am
index ffa291d7..7b24502f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,6 +28,7 @@ endif
 regress_LDADD = ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
 regress_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \
 	-I$(top_srcdir)/include  $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
+regress_LDFLAGS = $(PTHREAD_CFLAGS)
 bench_SOURCES = bench.c
 bench_LDADD = ../libevent.la
 bench_cascade_SOURCES = bench_cascade.c
diff --git a/test/regress_http.c b/test/regress_http.c
index 630cf762..afb0e1d9 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -2014,6 +2014,11 @@ http_stream_in_cancel_test(void)
 static void
 http_connection_retry_done(struct evhttp_request *req, void *arg)
 {
+	if (req == NULL) {
+		fprintf(stderr, "FAILED (connection aborted)\n");
+		exit(1);
+	}
+	
 	if (req->response_code == HTTP_OK) {
 		fprintf(stderr, "FAILED\n");
 		exit(1);