diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae1e97f02d..5809f7d20f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,7 +96,6 @@ endif WITH_STORAGE_FS
 
 if WITH_NSS
 test_helpers += nsslinktest nssguestlinktest
-test_programs += nsstest nssguesttest
 endif WITH_NSS
 
 test_scripts =
@@ -436,25 +435,6 @@ viridentitytest_DEPENDENCIES = libsecurityselinuxhelper.la \
 endif WITH_SELINUX
 
 if WITH_NSS
-nsstest_SOURCES = \
-	nsstest.c testutils.h testutils.c
-nsstest_CFLAGS = \
-	$(AM_CFLAGS) \
-	-I$(top_srcdir)/tools/nss
-nsstest_LDADD = \
-	$(LDADDS) \
-	../tools/nss/libnss_libvirt_impl.la
-
-nssguesttest_SOURCES = \
-	nsstest.c testutils.h testutils.c
-nssguesttest_CFLAGS = \
-	-DLIBVIRT_NSS_GUEST \
-	$(AM_CFLAGS) \
-	-I$(top_srcdir)/tools/nss
-nssguesttest_LDADD = \
-	$(LDADDS) \
-	../tools/nss/libnss_libvirt_guest_impl.la
-
 ## Intentionaly not linking with anything else.
 ## See the test source for more detailed explanation.
 nsslinktest_SOURCES = nsslinktest.c
diff --git a/tests/meson.build b/tests/meson.build
index 7ac481dd8c..b8cf6911f6 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -410,6 +410,23 @@ if conf.has('WITH_NODE_DEVICES')
   ]
 endif
 
+if conf.has('WITH_NSS')
+  tests += [
+    {
+      'name': 'nsstest',
+      'include': [ nss_inc_dir ],
+      'link_with': [ nss_libvirt_impl ],
+    },
+    {
+      'name': 'nssguesttest',
+      'sources': [ 'nsstest.c' ],
+      'c_args': [ '-DLIBVIRT_NSS_GUEST' ],
+      'include': [ nss_inc_dir ],
+      'link_with': [ nss_libvirt_guest_impl ],
+    },
+  ]
+endif
+
 foreach data : tests
   test_sources = '@0@.c'.format(data['name'])
   test_bin = executable(
diff --git a/tools/nss/meson.build b/tools/nss/meson.build
index b07bfa4be8..cf3eec9b24 100644
--- a/tools/nss/meson.build
+++ b/tools/nss/meson.build
@@ -88,3 +88,5 @@ nss_libvirt_guest_lib = shared_library(
   install: true,
   install_dir: libdir,
 )
+
+nss_inc_dir = include_directories('.')