diff --git a/test/Makefile.am b/test/Makefile.am
index fb262922..488c778f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-AM_LDFLAGS  = $(COMMON_LDFLAGS)
+AM_LDFLAGS  = $(COMMON_LDFLAGS) $(BOOST_LDFLAGS) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB)
 AM_CXXFLAGS = $(COMMON_CXXFLAGS) -I$(top_srcdir)
 
 TEST_BIN = 		\
@@ -28,7 +28,7 @@ TEST_BIN = 		\
 	version
 
 AM_DEFAULT_SOURCE_EXT = .cpp
-LDADD = $(builddir)/../libutil.la
+LDADD = $(builddir)/../.libs/libutil.a
 
 if PLATFORM_WIN32
 hton_LDFLAGS = -lws2_32
diff --git a/test/static.test b/test/static.test
index 73295e42..85f738a2 100755
--- a/test/static.test
+++ b/test/static.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-tests=($(find . -maxdepth 1 -type f -executable | grep -v test))
+tests=($(find . -type f -executable | grep -v test))
 
 echo 1..$((${#tests[@]}))