diff --git a/Makefile.am b/Makefile.am
index f57781970a7e7036d3f40fa092e32a1e9afddc4b..051e6f541460dd4bf7baf0b8f5b6fc954363af4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -821,9 +821,12 @@ dist_TESTS = \
 	$(python_tests)
 
 nodist_TESTS =
+check_SCRIPTS =
+
 if WANT_HTOOLSTESTS
 nodist_TESTS += $(haskell_tests)
 dist_TESTS += htools/offline-test.sh
+check_SCRIPTS += htools/htools-hpc
 endif
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -865,7 +868,7 @@ srclink_files = \
 	test/ganeti-cleaner_unittest.bash \
 	test/import-export_unittest.bash \
 	htools/offline-test.sh \
-	htools/cli-tests.sh \
+	htools/cli-tests-defs.sh \
 	$(all_python_code) \
 	$(HS_LIB_SRCS) $(HS_PROG_SRCS)