diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index d8220f4db..b28ba928f 100644
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -205,10 +205,12 @@ check_PROGRAMS = $(PROGRAM_TESTS) test_soft_pkcs11
 LDADD = libhx509.la
 
 test_soft_pkcs11_LDADD = libhx509.la
-test_soft_pkcs11_CPPFLAGS = -I$(srcdir)/ref
+test_soft_pkcs11_CPPFLAGS = $(INCLUDE_hcrypto) -I$(srcdir)/ref
 
 test_name_CPPFLAGS = $(INCLUDE_hcrypto)
 test_name_LDADD = libhx509.la $(LIB_roken)
+test_expr_CPPFLAGS = $(INCLUDE_hcrypto)
+test_expr_LDADD = libhx509.la $(LIB_roken)
 
 TESTS = $(SCRIPT_TESTS) $(PROGRAM_TESTS)