diff --git a/tests/Makefile.am b/tests/Makefile.am
index 381a7921cf..b5f555baa4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,10 +27,6 @@ test_programs += \
 	$(NULL)
 endif WITH_REMOTE
 
-if WITH_LIBVIRTD
-test_programs += fdstreamtest
-endif WITH_LIBVIRTD
-
 if WITH_SECDRIVER_SELINUX
 if WITH_ATTR
 test_programs += securityselinuxtest \
@@ -148,11 +144,6 @@ libvirtd_test_scripts = \
 
 if WITH_LIBVIRTD
 test_scripts += $(libvirtd_test_scripts)
-
-test_programs += \
-	eventtest \
-	virdrivermoduletest \
-	virdriverconnvalidatetest
 endif WITH_LIBVIRTD
 
 if WITH_SECDRIVER_APPARMOR
@@ -610,23 +601,3 @@ endif WITH_SECDRIVER_SELINUX
 virjsontest_SOURCES = \
 	virjsontest.c testutils.h testutils.c
 virjsontest_LDADD = $(LDADDS)
-
-if WITH_LIBVIRTD
-virdrivermoduletest_SOURCES = \
-	virdrivermoduletest.c testutils.h testutils.c
-virdrivermoduletest_LDADD = $(LDADDS)
-
-virdriverconnvalidatetest_SOURCES = \
-	virdriverconnvalidatetest.c testutils.h testutils.c
-virdriverconnvalidatetest_LDADD = $(LDADDS)
-endif WITH_LIBVIRTD
-
-if WITH_LIBVIRTD
-eventtest_SOURCES = \
-	eventtest.c testutils.h testutils.c
-eventtest_LDADD = $(LDADDS)
-endif WITH_LIBVIRTD
-
-fdstreamtest_SOURCES = \
-	fdstreamtest.c testutils.h testutils.c
-fdstreamtest_LDADD = $(LDADDS)
diff --git a/tests/meson.build b/tests/meson.build
index bc42b1c86a..87dd99df88 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -372,6 +372,15 @@ if conf.has('WITH_ESX')
   ]
 endif
 
+if conf.has('WITH_LIBVIRTD')
+  tests += [
+    { 'name': 'eventtest', 'deps': [ thread_dep ] },
+    { 'name': 'fdstreamtest' },
+    { 'name': 'virdriverconnvalidatetest' },
+    { 'name': 'virdrivermoduletest' },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0@.c'.format(data['name'])
   test_bin = executable(