diff --git a/meson.build b/meson.build
index 60936dd68..7728de23f 100644
--- a/meson.build
+++ b/meson.build
@@ -614,6 +614,7 @@ top_includepath = include_directories('.')
 subdir('cogl')
 subdir('clutter')
 subdir('data')
+subdir('tools')
 subdir('src')
 subdir('po')
 subdir('doc/man')
diff --git a/src/tests/meson.build b/src/tests/meson.build
index b58636c55..9b9990577 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -429,3 +429,16 @@ if have_x11
     timeout: 60,
   )
 endif
+
+test('get-state-tool', mutter,
+  args: [
+    '--headless',
+    '--mutter-plugin=@0@'.format(default_plugin.full_path()),
+    '--virtual-monitor', '800x600',
+    get_state_tool.full_path(),
+  ],
+  suite: ['tools'],
+  env: test_env,
+  is_parallel: false,
+  timeout: 60,
+)
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 000000000..83e98721c
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1 @@
+get_state_tool = find_program('get-state.py')