diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1c54f44f5e..0e3ccdd066 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -620,7 +620,13 @@ commandtest_LDADD = $(LDADDS)
 
 commandhelper_SOURCES = \
 	commandhelper.c
-commandhelper_LDADD = $(LDADDS)
+commandhelper_LDADD = \
+	$(WARN_CFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
+	$(PROBES_O) \
+	../src/libvirt_util.la \
+	$(GNULIB_LIBS)
+
 commandhelper_LDFLAGS = -static
 
 if WITH_LIBVIRTD