diff --git a/meson.build b/meson.build
index 2548614477d..7089ba4bdc0 100644
--- a/meson.build
+++ b/meson.build
@@ -54,7 +54,7 @@ with_osmesa = get_option('osmesa')
 with_swr_arches = get_option('swr-arches').split(',')
 with_tools = get_option('tools').split(',')
 if with_tools.contains('all')
-  with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau']
+  with_tools = ['freedreno', 'glsl', 'intel', 'nir', 'nouveau', 'xvmc']
 endif
 if get_option('texture-float')
   pre_args += '-DTEXTURE_FLOAT_ENABLED'
diff --git a/meson_options.txt b/meson_options.txt
index a573290b774..496fe38c718 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -284,5 +284,5 @@ option(
   'tools',
   type : 'string',
   value : '',
-  description : 'Comma delimited list of tools to build. choices : freedreno,glsl,intel,nir,nouveau or all'
+  description : 'Comma delimited list of tools to build. choices : freedreno,glsl,intel,nir,nouveau,xvmc or all'
 )
diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build
index 2c98b0290d9..d120d533eef 100644
--- a/src/gallium/state_trackers/xvmc/meson.build
+++ b/src/gallium/state_trackers/xvmc/meson.build
@@ -27,31 +27,27 @@ libxvmc_st = static_library(
 )
 
 # These tests will not work without a working xvmc configuration. 
-if with_tests
+if with_tools.contains('xvmc')
   dep_xvmcw = cc.find_library('XvMCW')
   dep_real_xvmc = dependency('xvmc')
   foreach x : ['context', 'surface', 'subpicture', 'blocks', 'rendering']
     _name = 'xvmc_@0@'.format(x)
-    test(
-      _name,
-      executable(
-        _name,
-        files('tests/test_@0@.c'.format(x), 'tests/testlib.c'), 
-        dependencies : [
-          dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw,
-        ],
-      )
-    )
-  endforeach
-
-  test(
-    'xvmc_bench',
     executable(
-      'xvmc_bench',
-      files('tests/xvmc_bench.c', 'tests/testlib.c'), 
+      _name,
+      files('tests/test_@0@.c'.format(x), 'tests/testlib.c'),
       dependencies : [
         dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw,
       ],
+      install: true,
     )
+  endforeach
+
+  executable(
+    'xvmc_bench',
+    files('tests/xvmc_bench.c', 'tests/testlib.c'),
+    dependencies : [
+      dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw,
+    ],
+    install: true,
   )
 endif