diff --git a/build-and-test.sh b/build-and-test.sh
index 969e1b2..c771d9f 100755
--- a/build-and-test.sh
+++ b/build-and-test.sh
@@ -69,7 +69,7 @@ elif [ "x$BUILD_OPENSSL_VERSION" = "x1.1" ]; then
     make -f linux.mk VERSION=$version
 else
     ./configure $COVERAGE
-    make check
+    make all check
     if [ "x$COVERAGE" != "x" ]; then
         gem install coveralls-lcov
         coveralls-lcov coverage/app2.info
diff --git a/configure.ac b/configure.ac
index f67d51f..a9e4d15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_SUBST([LT_CURRENT], 5)
 AC_SUBST([LT_REVISION], 0)
 AC_SUBST([LT_AGE], 4)
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AM_SILENT_RULES([yes])
 AC_PROG_CC
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index d0900f0..716c69c 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -38,7 +38,8 @@ endif
 
 LDADD = ../libykpiv.la $(OPENSSL_LIBS)
 
-api_SOURCES = api.c ../../tool/openssl-compat.c ../../tool/openssl-compat.h
+api_LDADD = ../../tool/libpiv_util.la
+api_SOURCES = api.c
 check_PROGRAMS = basic parse_key api
 TESTS = $(check_PROGRAMS)
 
diff --git a/ykcs11/tests/Makefile.am b/ykcs11/tests/Makefile.am
index 456abbb..00f8881 100644
--- a/ykcs11/tests/Makefile.am
+++ b/ykcs11/tests/Makefile.am
@@ -42,9 +42,8 @@ else
 AM_LDFLAGS += -no-install
 endif
 
-ykcs11_tests_LDADD = ../libykcs11.la $(OPENSSL_LIBS)
-
-ykcs11_tests_SOURCES = ykcs11_tests.c ../../tool/openssl-compat.c ../../tool/openssl-compat.h
+ykcs11_tests_LDADD = ../libykcs11.la $(OPENSSL_LIBS) ../../tool/libpiv_util.la
+ykcs11_tests_SOURCES = ykcs11_tests.c
 check_PROGRAMS = ykcs11_tests
 TESTS = reset.sh $(check_PROGRAMS)