diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4
index 7f69f515f..960aa4f64 100644
--- a/config.d/ac_config_files.m4
+++ b/config.d/ac_config_files.m4
@@ -24,6 +24,7 @@
 	libs/qw/Makefile
 	libs/ruamoko/Makefile
 	libs/util/Makefile
+	libs/util/test/Makefile
 	libs/video/Makefile
 	libs/video/renderer/Makefile
 	libs/video/renderer/gl/Makefile
diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am
index f833fc80c..9b20ffbeb 100644
--- a/libs/models/Makefile.am
+++ b/libs/models/Makefile.am
@@ -6,8 +6,6 @@ INCLUDES= -I$(top_srcdir)/include
 
 lib_LTLIBRARIES=	libQFmodels.la @VID_MODEL_TARGETS@
 EXTRA_LTLIBRARIES=	libQFmodels_gl.la libQFmodels_sw.la
-EXTRA_DIST=	trace-id.c
-TESTS=$(check_PROGRAMS)
 
 models_sources = clip_hull.c model.c trace.c
 
diff --git a/libs/models/test/Makefile.am b/libs/models/test/Makefile.am
index b15de5e18..31670db4e 100644
--- a/libs/models/test/Makefile.am
+++ b/libs/models/test/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS= foreign
 INCLUDES= -I$(srcdir) -I$(top_srcdir)/include
 
 check_PROGRAMS=testclip
+EXTRA_DIST=	trace-id.c
 
 testclip_SOURCES=testclip.c
 testclip_LDADD= $(top_builddir)/libs/models/libQFmodels.la $(top_builddir)/libs/util/libQFutil.la
diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am
index 713f3abfb..11eafb74c 100644
--- a/libs/util/Makefile.am
+++ b/libs/util/Makefile.am
@@ -1,4 +1,7 @@
 AUTOMAKE_OPTIONS= foreign
+
+SUBDIRS= . test
+
 AM_CFLAGS= @PREFER_PIC@
 CCASFLAGS+= @PREFER_PIC@
 INCLUDES= -I$(top_srcdir)/include
@@ -41,11 +44,4 @@ libQFutil_la_SOURCES= \
 	qfplist.c quakefs.c quakeio.c riff.c script.c sizebuf.c string.c sys.c \
 	va.c ver_check.c wad.c wadfile.c zone.c $(fnmatch) $(getopt)
 
-check_PROGRAMS=test-qfs
-
-test_qfs_SOURCES=test-qfs.c
-test_qfs_LDADD=$(builddir)/libQFutil.la
-test_qfs_DEPENDENCIES=$(builddir)/libQFutil.la
-
 EXTRA_DIST= $(fnmatch_src) $(getopt_src)
-TESTS=$(check_PROGRAMS)
diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am
new file mode 100644
index 000000000..750682068
--- /dev/null
+++ b/libs/util/test/Makefile.am
@@ -0,0 +1,11 @@
+AUTOMAKE_OPTIONS= foreign
+
+INCLUDES= -I$(top_srcdir)/include
+
+check_PROGRAMS=test-qfs
+
+test_qfs_SOURCES=test-qfs.c
+test_qfs_LDADD=$(top_builddir)/libs/util/libQFutil.la
+test_qfs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la
+
+TESTS=$(check_PROGRAMS)
diff --git a/libs/util/test-qfs.c b/libs/util/test/test-qfs.c
similarity index 100%
rename from libs/util/test-qfs.c
rename to libs/util/test/test-qfs.c