diff --git a/meson.build b/meson.build
index 161c5ef..b77ee85 100644
--- a/meson.build
+++ b/meson.build
@@ -119,9 +119,8 @@ pkgconf_exe = executable('pkgconf',
 if get_option('tests')
   kyua_exe = find_program('kyua')
   atf_sh_exe = find_program('atf-sh')
-  test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile=' + join_paths(meson.current_build_dir(), 'Kyuafile'), '--build-root=' + meson.current_build_dir()])
-
-  configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
+  kyuafile = configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
+  test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile', kyuafile, '--build-root', meson.current_build_dir()])
   subdir('tests')
 endif
 
diff --git a/tests/meson.build b/tests/meson.build
index beaf393..d68096b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -18,6 +18,6 @@ tests = [
 
 # yuck
 foreach test : tests
-  configure_file(input: test + '.sh', output: test, copy: true)
-  run_command('chmod', '755', join_paths(meson.current_build_dir(), 'tests', test))
+  test_file = configure_file(input: test + '.sh', output: test, copy: true)
+  run_command('chmod', '755', test_file)
 endforeach