diff --git a/Makefile.lib b/Makefile.lib
index 3dd69384..96c85185 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -191,6 +191,21 @@ test-default:
 
 ifdef TEST_PROGS
 TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
+TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
+ $(top_builddir)/src/util/fastfind.o \
+
+# Add most of the basic utility library to the test dependencies.
+TESTDEPS += \
+ $(top_builddir)/src/intl/charsets.o \
+ $(top_builddir)/src/osdep/stub.o \
+ $(top_builddir)/src/util/conv.o \
+ $(top_builddir)/src/util/error.o \
+ $(top_builddir)/src/util/file.o \
+ $(top_builddir)/src/util/hash.o \
+ $(top_builddir)/src/util/memory.o \
+ $(top_builddir)/src/util/string.o \
+ $(top_builddir)/src/util/time.o
+
 TESTDEPS += $(TESTDEPS-yes)
 
 TEST_LIB=$(top_srcdir)/test/libtest.sh
diff --git a/src/dom/test/Makefile b/src/dom/test/Makefile
index 27ae7afe..0fd3a89f 100644
--- a/src/dom/test/Makefile
+++ b/src/dom/test/Makefile
@@ -8,11 +8,6 @@ TEST_PROGS = \
  sgml-parser
 
 TESTDEPS = \
- $(top_builddir)/src/dom/$(LIB_O_NAME) \
- $(top_builddir)/src/util/error.o \
- $(top_builddir)/src/osdep/stub.o \
- $(top_builddir)/src/util/hash.o \
- $(top_builddir)/src/util/string.o \
- $(top_builddir)/src/util/memory.o
+ $(top_builddir)/src/dom/$(LIB_O_NAME)
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/mime/backend/Makefile b/src/mime/backend/Makefile
index 10582421..7b051768 100644
--- a/src/mime/backend/Makefile
+++ b/src/mime/backend/Makefile
@@ -16,21 +16,8 @@ mailcap-cache.o: mailcap.c
 
 TESTDEPS = \
  common.o \
- $(top_builddir)/src/intl/charsets.o \
- $(top_builddir)/src/osdep/osdep.o \
- $(top_builddir)/src/osdep/stub.o \
- $(top_builddir)/src/util/conv.o \
- $(top_builddir)/src/util/error.o \
- $(top_builddir)/src/util/file.o \
- $(top_builddir)/src/util/hash.o \
- $(top_builddir)/src/util/memory.o \
- $(top_builddir)/src/util/string.o \
- $(top_builddir)/src/util/time.o
+ $(top_builddir)/src/osdep/osdep.o
 
 TESTDEPS-$(CONFIG_NLS)	 += $(top_builddir)/src/intl/gettext/lib.o
-TESTDEPS-$(CONFIG_DEBUG) += $(top_builddir)/src/util/memdebug.o
-TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
- $(top_builddir)/src/util/fastfind.o \
-
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/protocol/ftp/Makefile b/src/protocol/ftp/Makefile
index cd805b62..d48c8d85 100644
--- a/src/protocol/ftp/Makefile
+++ b/src/protocol/ftp/Makefile
@@ -7,18 +7,7 @@ TEST_PROGS = \
  ftp-parser
 
 TESTDEPS = \
- $(top_builddir)/src/intl/charsets.o \
- $(top_builddir)/src/osdep/stub.o \
  $(top_builddir)/src/protocol/date.o \
- $(top_builddir)/src/protocol/ftp/parse.o \
- $(top_builddir)/src/util/conv.o \
- $(top_builddir)/src/util/error.o \
- $(top_builddir)/src/util/hash.o \
- $(top_builddir)/src/util/memory.o \
- $(top_builddir)/src/util/string.o \
- $(top_builddir)/src/util/time.o
-
-TESTDEPS-$(call not,$(CONFIG_SMALL)) += \
- $(top_builddir)/src/util/fastfind.o \
+ $(top_builddir)/src/protocol/ftp/parse.o
 
 include $(top_srcdir)/Makefile.lib