diff --git a/HACKING.md b/HACKING.md
index ba5f71f9..4c037d0f 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -40,7 +40,7 @@ Most common testing is done in CI. Occasionally, and for each release, do perfor
 Testing with an application:
 
 ```
-python3 tests/entry.py
+python3 tools/entry.py
 ```
 
 Testing visibility:
diff --git a/debian/control b/debian/control
index eba8e260..1c61852a 100644
--- a/debian/control
+++ b/debian/control
@@ -45,9 +45,12 @@ Description: On-screen keyboard for Wayland
 Package: squeekboard-devel
 Architecture: linux-any
 Depends:
+ python3,
+ python3-gi,
  ${shlibs:Depends}
  ${misc:Depends}
 Description: Resources for making Squeekboard layouts
- Tools for creating Squeekboard layouts:
+ Tools for creating and testing Squeekboard layouts:
  .
+  * squeekboard-entry
   * squeekboard-test-layout
diff --git a/debian/squeekboard-devel.install b/debian/squeekboard-devel.install
index eca02621..85485918 100644
--- a/debian/squeekboard-devel.install
+++ b/debian/squeekboard-devel.install
@@ -1 +1,2 @@
 usr/bin/squeekboard-test-layout /usr/bin
+usr/bin/squeekboard-entry /usr/bin
diff --git a/meson.build b/meson.build
index 9b9f7a63..8dd2ed61 100644
--- a/meson.build
+++ b/meson.build
@@ -40,6 +40,7 @@ else
 endif
 
 prefix = get_option('prefix')
+bindir = join_paths(prefix, get_option('bindir'))
 datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
 if get_option('depdatadir') == ''
@@ -67,4 +68,5 @@ subdir('data')
 subdir('protocols')
 subdir('eek')
 subdir('src')
+subdir('tools')
 subdir('tests')
diff --git a/src/meson.build b/src/meson.build
index 7e106c49..e8a369df 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -112,16 +112,3 @@ squeekboard = executable('squeekboard',
     '-DEEK_COMPILATION=1'],
 )
 
-bindir = join_paths(prefix, get_option('bindir'))
-
-test_layout = custom_target('squeekboard-test-layout',
-    build_by_default: true,
-    # meson doesn't track all inputs, cargo does
-    build_always_stale: true,
-    output: ['squeekboard-test-layout'],
-    console: true,
-    command: [cargo_build] + cargo_build_flags
-        + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'],
-    install: true,
-    install_dir: bindir,
-)
diff --git a/tests/entry.py b/tools/entry.py
old mode 100644
new mode 100755
similarity index 100%
rename from tests/entry.py
rename to tools/entry.py
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 00000000..9246326a
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,19 @@
+entry = configure_file(
+    copy: true,
+    input: 'entry.py',
+    output: 'squeekboard-entry',
+    install: true,
+    install_dir: bindir,
+)
+
+test_layout = custom_target('squeekboard-test-layout',
+    build_by_default: true,
+    # meson doesn't track all inputs, cargo does
+    build_always_stale: true,
+    output: ['squeekboard-test-layout'],
+    console: true,
+    command: [cargo_build] + cargo_build_flags
+        + ['--rename', 'test_layout', '@OUTPUT@', '--bin', 'test_layout'],
+    install: true,
+    install_dir: bindir,
+)