diff --git a/tests/Makefile.am b/tests/Makefile.am
index da4dc2d..478e022 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,11 +16,11 @@ check_HEADERS  = check_lib.h
 check_PROGRAMS =
 
 if BOOKMARKFS_UTIL
-  check_PROGRAMS += check-bookmarkfs-util
+  check_PROGRAMS += check-util-lib
 
-  check_bookmarkfs_util_CPPFLAGS = -I$(top_srcdir)/src
-  check_bookmarkfs_util_LDADD    = $(top_builddir)/src/libbookmarkfs_util.la
-  check_bookmarkfs_util_SOURCES  = check_lib.c check_watcher.c
+  check_util_lib_CPPFLAGS = -I$(top_srcdir)/src
+  check_util_lib_LDADD    = $(top_builddir)/src/libbookmarkfs_util.la
+  check_util_lib_SOURCES  = check_lib.c check_watcher.c
 endif  # BOOKMARKFS_UTIL
 
 # Autotest setup
diff --git a/tests/lib_hash.at b/tests/lib_hash.at
index 5fe3bcd..5704c99 100644
--- a/tests/lib_hash.at
+++ b/tests/lib_hash.at
@@ -16,7 +16,7 @@ AT_KEYWORDS([lib hash])
 # see <https://github.com/Cyan4973/xxHash/tree/dev/tests>.
 ATX_CHECK_LIB([
     calc_digest() {
-        echo "$2" | check-bookmarkfs-util hash -s$1
+        echo "$2" | check-util-lib hash -s$1
     }
 
     seed=$(ath_fn_rand_u64_hex)
diff --git a/tests/lib_prng.at b/tests/lib_prng.at
index 28dc0cc..5155a56 100644
--- a/tests/lib_prng.at
+++ b/tests/lib_prng.at
@@ -15,7 +15,7 @@ AT_KEYWORDS([lib prng])
 # For reliable testing of PRNGs, see <https://prng.di.unimi.it/#quality>.
 ATX_CHECK_LIB([
     gen_num() {
-        check-bookmarkfs-util prng -s$1 -n$2
+        check-util-lib prng -s$1 -n$2
     }
 
     gen_seed() {
diff --git a/tests/lib_watcher.at b/tests/lib_watcher.at
index d978497..fdbde9c 100644
--- a/tests/lib_watcher.at
+++ b/tests/lib_watcher.at
@@ -19,7 +19,7 @@ ATX_CHECK_LIB([
     tmpdir=./$(ath_fn_rand_u64_hex).tmp.d
 
     mkdir $tmpdir
-    check-bookmarkfs-util watcher $args $tmpdir
+    check-util-lib watcher $args $tmpdir
 ])
 
 AT_CLEANUP