diff --git a/meson.build b/meson.build
index 8ec7a625..590fb78d 100644
--- a/meson.build
+++ b/meson.build
@@ -572,16 +572,12 @@ configure_file(input : 'tools/libinput-measure-touchpad-tap.man',
 	       install_dir : join_paths(get_option('mandir'), 'man1')
 	       )
 
-config_builddir = configuration_data()
-config_builddir.set('BUILDDIR', meson.build_root())
-# libinput-measure-touchpad-pressure gets built but we install_data the
-# source instead. The built file is the one that uses the local quirks
-# and should be used for debugging.
-install_data('tools/libinput-measure-touchpad-pressure',
-	     install_dir : libinput_tool_path)
-configure_file(input: 'tools/libinput-measure-touchpad-pressure',
+config_noop = configuration_data()
+configure_file(input: 'tools/libinput-measure-touchpad-pressure.py',
 	       output: 'libinput-measure-touchpad-pressure',
-	       configuration : config_builddir
+	       configuration : config_noop,
+	       install : true,
+	       install_dir : libinput_tool_path
 	       )
 
 configure_file(input : 'tools/libinput-measure-touchpad-pressure.man',
@@ -590,14 +586,11 @@ configure_file(input : 'tools/libinput-measure-touchpad-pressure.man',
 	       install : true,
 	       install_dir : join_paths(get_option('mandir'), 'man1')
 	       )
-# libinput-measure-touch-size gets built but we install_data the source
-# instead. The built file is the one that uses the local quirks and
-# should be used for debugging.
-install_data('tools/libinput-measure-touch-size',
-	     install_dir : libinput_tool_path)
-configure_file(input: 'tools/libinput-measure-touch-size',
+configure_file(input: 'tools/libinput-measure-touch-size.py',
 	       output: 'libinput-measure-touch-size',
-	       configuration : config_builddir
+	       configuration : config_noop,
+	       install : true,
+	       install_dir : libinput_tool_path
 	       )
 
 configure_file(input : 'tools/libinput-measure-touch-size.man',
diff --git a/tools/libinput-measure-touch-size b/tools/libinput-measure-touch-size.py
similarity index 96%
rename from tools/libinput-measure-touch-size
rename to tools/libinput-measure-touch-size.py
index a2624354..9687e0bd 100755
--- a/tools/libinput-measure-touch-size
+++ b/tools/libinput-measure-touch-size.py
@@ -222,15 +222,7 @@ class Device(object):
         sys.exit(1)
 
     def _init_thresholds_from_quirks(self):
-        # This is replaced for the version in builddir but left as-is for
-        # the installed version. For the builddir one we need to run the
-        # builddir quirks list
-        builddir = '@BUILDDIR@'
-        if builddir != '@' + 'BUILDDIR' + '@':
-            command = [os.path.join(builddir, 'libinput-quirks'), 'list']
-        else:
-            command = ['libinput', 'quirks', 'list']
-        command.append(self.path)
+        command = ['libinput', 'quirks', 'list', self.path]
         cmd = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         if cmd.returncode != 0:
             print("Error querying quirks: {}".format(cmd.stderr.decode('utf-8')), file=sys.stderr)
diff --git a/tools/libinput-measure-touchpad-pressure b/tools/libinput-measure-touchpad-pressure.py
similarity index 95%
rename from tools/libinput-measure-touchpad-pressure
rename to tools/libinput-measure-touchpad-pressure.py
index b842cbd2..5d30a8b2 100755
--- a/tools/libinput-measure-touchpad-pressure
+++ b/tools/libinput-measure-touchpad-pressure.py
@@ -200,15 +200,7 @@ class Device(object):
         sys.exit(1)
 
     def _init_thresholds_from_quirks(self):
-        # This is replaced for the version in builddir but left as-is for
-        # the installed version. For the builddir one we need to run the
-        # builddir quirks list
-        builddir = '@BUILDDIR@'
-        if builddir != '@' + 'BUILDDIR' + '@':
-            command = [os.path.join(builddir, 'libinput-quirks'), 'list']
-        else:
-            command = ['libinput', 'quirks', 'list']
-        command.append(self.path)
+        command = ['libinput', 'quirks', 'list', self.path]
         cmd = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         if cmd.returncode != 0:
             print("Error querying quirks: {}".format(cmd.stderr.decode('utf-8')), file=sys.stderr)