diff --git a/meson.build b/meson.build
index f7bcf48b9e..fc03f68d10 100644
--- a/meson.build
+++ b/meson.build
@@ -892,6 +892,7 @@ foreach pair : [['utmp',          'HAVE_UTMP'],
 endforeach
 
 want_tests = get_option('tests')
+install_tests = get_option('install-tests')
 tests = []
 
 #####################################################################
@@ -1870,13 +1871,18 @@ foreach tuple : tests
   name = sources[0].split('/')[-1].split('.')[0]
 
   if condition == '' or conf.get(condition, 0) == 1
+    install = install_tests and type == ''
+
     exe = executable(
         name,
         sources,
         include_directories : incs,
         link_with : link_with,
         dependencies : dependencies,
-        c_args : defs)
+        c_args : defs,
+        install : install,
+        install_dir : testsdir)
+
     if type == 'manual'
       message('@0@ is a manual test'.format(name))
     elif type == 'unsafe' and want_tests != 'unsafe'
diff --git a/meson_options.txt b/meson_options.txt
index 9295b9c27c..981eace590 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -201,3 +201,5 @@ option('zshcompletiondir', type : 'string',
 
 option('tests', type : 'combo', choices : ['yes', 'unsafe'],
        description : 'enable extra tests with =unsafe')
+option('install-tests', type : 'boolean', value : 'false',
+       description : 'install test executables')