diff --git a/panels/printers/meson.build b/panels/printers/meson.build
index ca5ee5f2e1..14a284e7ff 100644
--- a/panels/printers/meson.build
+++ b/panels/printers/meson.build
@@ -76,6 +76,11 @@ else
   sources += 'pp-samba-stub.c'
 endif
 
+cflags += [
+  '-DDATADIR="@0@"'.format(control_center_datadir),
+  '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir)
+]
+
 printers_panel_lib = static_library(
   cappletname,
   sources: sources,
diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
index f55bf8896f..3908c7167b 100644
--- a/panels/printers/pp-host.c
+++ b/panels/printers/pp-host.c
@@ -214,7 +214,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, gpointer source_object, gpointer
     devices = g_ptr_array_new_with_free_func (g_object_unref);
 
     argv = g_new0 (gchar *, 3);
-    argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
+    argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
     argv[1] = g_strdup (priv->hostname);
 
     /* Use SNMP to get printer's informations */
diff --git a/panels/printers/pp-options-dialog.c b/panels/printers/pp-options-dialog.c
index b2df83af9c..376a1a598c 100644
--- a/panels/printers/pp-options-dialog.c
+++ b/panels/printers/pp-options-dialog.c
@@ -641,7 +641,7 @@ test_page_cb (PpOptionsDialog *self)
     gint i;
 
     if (self->printer_name) {
-        const gchar *const dirs[] = { "/usr/share/cups", "/usr/local/share/cups", NULL };
+        const gchar *const dirs[] = { DATADIR "/cups", "/usr/local/share/cups", NULL };
         const gchar *datadir = NULL;
         g_autofree gchar *filename = NULL;
 
diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h
index add08ac8a7..cdb37a249f 100644
--- a/panels/system/datetime/tz.h
+++ b/panels/system/datetime/tz.h
@@ -28,9 +28,9 @@
 G_BEGIN_DECLS
 
 #ifndef __sun
-#define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
+#  define TZ_DATA_FILE DATADIR "/zoneinfo/zone.tab"
 #else
-#define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+#  define TZ_DATA_FILE DATADIR "/lib/zoneinfo/tab/zone_sun.tab"
 #endif
 
 typedef struct _TzDB TzDB;
diff --git a/panels/system/users/meson.build b/panels/system/users/meson.build
index 7c8a35dc72..f897269b64 100644
--- a/panels/system/users/meson.build
+++ b/panels/system/users/meson.build
@@ -97,6 +97,7 @@ assert(krb_dep.found(), 'kerberos libraries not found in your path')
 
 cflags += [
   '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir),
+  '-DBINDIR="@0@"'.format(control_center_bindir),
   '-DHAVE_LIBPWQUALITY',
   '-DUM_PIXMAP_DIR="@0@"'.format(join_paths(control_center_pkgdatadir, 'pixmaps'))
 ]
diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c
index 9f067dc942..35db6533cc 100644
--- a/panels/system/users/run-passwd.c
+++ b/panels/system/users/run-passwd.c
@@ -144,7 +144,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
     gchar **envp;
     gint my_stdin, my_stdout;
 
-    argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
+    argv[0] = BINDIR "/passwd";
     argv[1] = NULL;
 
     envp = g_get_environ ();
diff --git a/tests/datetime/meson.build b/tests/datetime/meson.build
index 021036881d..1b8f8d742d 100644
--- a/tests/datetime/meson.build
+++ b/tests/datetime/meson.build
@@ -13,8 +13,8 @@ env = [
       'NO_AT_BRIDGE=1'
 ]
 cflags = [
-  '-DTEST_SRCDIR="@0@"'.format(meson.current_source_dir()),
-  '-DSRCDIR="@0@"'.format(meson.project_source_root() + '/panels/datetime')
+  '-DDATADIR="@0@"'.format(control_center_datadir),
+  '-DSRCDIR="@0@"'.format(meson.source_root() + '/panels/datetime')
 ]
 
 foreach unit: test_units
diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
index 491f7e90d5..f9f2918826 100644
--- a/tests/datetime/test-endianess.c
+++ b/tests/datetime/test-endianess.c
@@ -26,11 +26,11 @@ test_endianess (void)
     g_autoptr(GDir) dir = NULL;
     const char *name;
 
-    dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
+	dir = g_dir_open (DATADIR "/i18n/locales/", 0, NULL);
     if (dir == NULL) {
         /* Try with /usr/share/locale/
          * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
-        dir = g_dir_open ("/usr/share/locale/", 0, NULL);
+		dir = g_dir_open (DATADIR "/locale/", 0, NULL);
         if (dir == NULL) {
             g_assert_not_reached ();
         }