diff --git a/data/meson.build b/data/meson.build
index a41fdc2..1633d98 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,7 +22,7 @@ dbus_inc = include_directories('.')
 install_data(dbus_interfaces, install_dir: ifacedir)
 
 schemas = ['org.sigxcpu.feedbackd.gschema.xml']
-compiled = gnome.compile_schemas(depend_files: schemas, build_by_default: true)
+compiled_schemas = gnome.compile_schemas(depend_files: schemas, build_by_default: true)
 
 compile_schemas = find_program('glib-compile-schemas', required: false)
 if compile_schemas.found()
diff --git a/src/meson.build b/src/meson.build
index 0e688e7..5483aca 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -53,7 +53,7 @@ if get_option('daemon')
     dependencies: fbd_deps,
   )
 
-  executable(
+  fbd_exe = executable(
     'feedbackd',
     sources: ['fbd.c', generated_dbus_sources[1]],
     include_directories: fbd_inc,
diff --git a/tests/meson.build b/tests/meson.build
index 20c9c74..71e7bd6 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -29,15 +29,10 @@ if get_option('tests')
 
   test_lfb_deps = [libfeedback_dep, glib, gio_unix]
 
-  lfb_tests = ['lfb-event']
-
   if get_option('daemon')
     # The integration test needs the daemon
-    lfb_tests += 'lfb-integration'
+    test = 'lfb-integration'
     subdir('services')
-  endif
-
-  foreach test : lfb_tests
     t = executable(
       'test-@0@'.format(test),
       ['test-@0@.c'.format(test)],
@@ -46,8 +41,19 @@ if get_option('tests')
       link_args: test_lfb_link_args,
       dependencies: test_lfb_deps,
     )
-    test(test, t, env: test_env)
-  endforeach
+    test(test, t, env: test_env, depends: fbd_exe)
+  endif
+
+  test = 'lfb-event'
+  t = executable(
+    'test-@0@'.format(test),
+    ['test-@0@.c'.format(test)],
+    c_args: test_lfb_cflags,
+    pie: true,
+    link_args: test_lfb_link_args,
+    dependencies: test_lfb_deps,
+  )
+  test(test, t, env: test_env)
 
   # Daemon Unit tests
   if get_option('daemon')
@@ -85,7 +91,7 @@ if get_option('tests')
         include_directories: fbd_inc,
         dependencies: test_fbd_deps,
       )
-      test(test, t, env: test_env_fbd)
+      test(test, t, env: test_env_fbd, depends: compiled_schemas)
     endforeach
 
   endif  # daemon