diff --git a/Makefile.am b/Makefile.am
index f2763b8..c04b90a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ AM_CPPFLAGS += -DQMCKL_TEST_DIR=\"$(QMCKL_TEST_DIR)\"
 
 
 lib_LTLIBRARIES = src/libqmckl.la
-src_libqmckl_la_SOURCES = $(qmckl_h) $(src_qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(header_tests)
+src_libqmckl_la_SOURCES = $(qmckl_h) $(src_qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES)
 
 CLEANFILES+=$(test_qmckl_fo) $(src_qmckl_fo) $(test_qmckl_o) $(src_qmckl_o) $(FH_TYPE_FILES) $(FH_FUNC_FILES)
 
diff --git a/tools/build_makefile.py b/tools/build_makefile.py
index 223a22f..653497e 100755
--- a/tools/build_makefile.py
+++ b/tools/build_makefile.py
@@ -236,13 +236,14 @@ def main():
     output+= ["",
               "## Test files",
               "",
+              "$(header_tests): $(TANGLED_FILES)",
               "$(test_qmckl_fo): $(test_qmckl_f)"]
     output += ["",
                 "check_PROGRAMS = $(TESTS)" ]
     for f in sorted(TESTS.keys()):
         prefix = "tests_" + f.rsplit("/",1)[-1]
         output += [ prefix + "_SOURCES = " + \
-                    " ".join(TESTS[f]),
+                    " ".join(TESTS[f]) + " $(header_tests)",
                     prefix + "_LDADD   = src/libqmckl.la",
                     "" ]