diff --git a/test/info/meson.build b/test/info/meson.build
new file mode 100644
index 0000000000..f95e839365
--- /dev/null
+++ b/test/info/meson.build
@@ -0,0 +1,70 @@
+#
+# run common display info tools like xdpyinfo
+#
+if get_option('xvfb')
+    xvfb_args = [
+        xvfb_server.full_path(),
+        '-screen',
+        'scrn',
+        '1280x1024x24'
+    ]
+
+    testlist = [
+        ['xdpyinfo', ['xdpyinfo', '-ext', 'all']],
+        ['xrandr',   ['xrandr', '--verbose']],
+        ['xvinfo',   ['xvinfo']],
+    ]
+
+    # run tests on xvfb
+    foreach test_walk: testlist
+        test(test_walk[0],
+            simple_xinit,
+            args: [
+                test_walk[1],
+                '--',
+                xvfb_args
+            ],
+            suite: 'xvfb display info',
+            timeout: 300,
+        )
+    endforeach
+
+    # run tests on xephyr inside xvfb
+    if get_option('xephyr') and build_glamor
+        foreach test_walk: testlist
+            test(test_walk[0],
+                simple_xinit,
+                args: [
+                    simple_xinit.full_path(),
+                    test_walk[1],
+                    '----',
+                    xephyr_server.full_path(),
+                    '-schedMax', '2000',
+                    '--',
+                    xvfb_args
+                ],
+                suite: 'xehypr info',
+                timeout: 300,
+            )
+        endforeach
+    endif
+    if get_option('xephyr') and build_glamor
+        foreach test_walk: testlist
+            test(test_walk[0],
+                simple_xinit,
+                args: [
+                    simple_xinit.full_path(),
+                    test_walk[1],
+                    '----',
+                    xephyr_server.full_path(),
+                    '-glamor',
+                    '-schedMax', '2000',
+                    '--',
+                    xvfb_args
+                ],
+                suite: 'xehypr-glamor display info',
+                timeout: 300,
+            )
+        endforeach
+    endif
+endif
diff --git a/test/meson.build b/test/meson.build
index 3644aa8173..8eac0f14b5 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -77,6 +77,8 @@ rendercheck_tests_gles2_success = rendercheck_blend_gles2 + rendercheck_tests_no
 rendercheck_tests_gles3 = rendercheck_blend_gles2 + rendercheck_tests_noblend + rendercheck_a8
 rendercheck = find_program('rendercheck', required:false)
 
+subdir('info')
+
 if get_option('xvfb')
     xvfb_args = [
         xvfb_server.full_path(),