diff --git a/src/Makefile.am b/src/Makefile.am
index b99eac910d..57549ec254 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,7 +76,6 @@ include access/Makefile.inc.am
 include logging/Makefile.inc.am
 include locking/Makefile.inc.am
 include admin/Makefile.inc.am
-include test/Makefile.inc.am
 include esx/Makefile.inc.am
 include vmx/Makefile.inc.am
 include vmware/Makefile.inc.am
diff --git a/src/meson.build b/src/meson.build
index ead0329a9e..2c6758eec9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -100,4 +100,5 @@ subdir('admin')
 subdir('esx')
 subdir('hyperv')
 subdir('openvz')
+subdir('test')
 subdir('vmware')
diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am
deleted file mode 100644
index c209414745..0000000000
--- a/src/test/Makefile.inc.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: filetype=automake
-
-TEST_DRIVER_SOURCES = \
-	test/test_driver.c \
-	test/test_driver.h \
-	$(NULL)
-TEST_DRIVER_ASSETS = test/test-screenshot.png
-
-DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES))
-
-if WITH_TEST
-
-driver_test_asset_DATA = $(TEST_DRIVER_ASSETS)
-driver_test_assetdir = $(pkgdatadir)
-
-noinst_LTLIBRARIES += libvirt_driver_test.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
-libvirt_driver_test_la_CFLAGS = \
-	-I$(srcdir)/conf \
-	$(AM_CFLAGS) \
-	$(NULL)
-libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
-endif WITH_TEST
diff --git a/src/test/meson.build b/src/test/meson.build
new file mode 100644
index 0000000000..ec7b12304e
--- /dev/null
+++ b/src/test/meson.build
@@ -0,0 +1,24 @@
+test_driver_sources = [
+  'test_driver.c',
+]
+
+test_driver_assets = [
+  'test-screenshot.png',
+]
+
+if conf.has('WITH_TEST')
+  test_lib = static_library(
+    'virt_test',
+    [
+      test_driver_sources,
+    ],
+    dependencies: [
+      src_dep,
+    ],
+    include_directories: [
+      conf_inc_dir,
+    ],
+  )
+
+  install_data(test_driver_assets, install_dir: pkgdatadir)
+endif