diff --git a/.gitignore b/.gitignore
index b31a7132d..d1bdc68de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,6 +167,7 @@ cscope.*
 /src/test/test-slow
 /src/test/test-bt-cl
 /src/test/test-child
+/src/test/test-memwipe
 /src/test/test-ntor-cl
 /src/test/test_workqueue
 /src/test/test.exe
diff --git a/src/test/include.am b/src/test/include.am
index 46fb99fc3..c0a1b374f 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -93,7 +93,7 @@ src_test_test_workqueue_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
         @TOR_LDFLAGS_libevent@
 src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
-	src/common/libor-crypto-testing.a $(LIBDONNA) \
+	src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \
 	src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
 	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \