diff --git a/Makefile.am b/Makefile.am
index 6c247a8..ebec8a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = src data tests pam doc po
+SUBDIRS = src data utils pam doc po
 EXTRA_DIST = TODO intltool-extract.in intltool-merge.in intltool-update.in
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-systemdsystemunitdir='$${libdir}/systemd/system-distcheck'
diff --git a/configure.ac b/configure.ac
index 5f971a7..2b57a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ AC_OUTPUT([
 Makefile
 src/Makefile
 data/Makefile
-tests/Makefile
+utils/Makefile
 pam/Makefile
 doc/Makefile
 doc/version.xml
diff --git a/tests/Makefile.am b/utils/Makefile.am
similarity index 100%
rename from tests/Makefile.am
rename to utils/Makefile.am
diff --git a/tests/delete.c b/utils/delete.c
similarity index 100%
rename from tests/delete.c
rename to utils/delete.c
diff --git a/tests/enroll.c b/utils/enroll.c
similarity index 100%
rename from tests/enroll.c
rename to utils/enroll.c
diff --git a/tests/list.c b/utils/list.c
similarity index 100%
rename from tests/list.c
rename to utils/list.c
diff --git a/tests/verify.c b/utils/verify.c
similarity index 100%
rename from tests/verify.c
rename to utils/verify.c