diff --git a/meson.build b/meson.build
index fe3ec079cf1..3a714238d43 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ project('systemd', 'c',
                 'localstatedir=/var',
                 'warning_level=2',
         ],
-        meson_version : '>= 0.53.2',
+        meson_version : '>= 0.54.0',
        )
 
 libsystemd_version = '0.36.0'
@@ -330,7 +330,7 @@ slow_tests = want_tests != 'false' and get_option('slow-tests')
 fuzz_tests = want_tests != 'false' and get_option('fuzz-tests')
 install_tests = get_option('install-tests')
 
-if add_languages('cpp', required : fuzzer_build)
+if add_languages('cpp', native : false, required : fuzzer_build)
         #  Used only for tests
         cxx = meson.get_compiler('cpp')
         cxx_cmd = ' '.join(cxx.cmd_array())
@@ -4449,8 +4449,8 @@ foreach test : tests
                 versiondep,
         ]
 
-        # FIXME: Use fs.stem() with meson >= 0.54.0
-        name = '@0@'.format(sources[0]).split('/')[-1]
+        # FIXME: Drop .format with meson >= 0.59.0
+        name = fs.stem('@0@'.format(sources[0]))
         if not name.endswith('.cc')
                 deps += [userspace]
         endif
@@ -4589,8 +4589,8 @@ foreach fuzzer : fuzzers
         endif
         sources += fuzz_generated_directives
 
-        # FIXME: Use fs.stem() with meson >= 0.54.0
-        name = '@0@'.format(sources[0]).split('/')[-1].split('.')[0]
+        # FIXME: Drop .format with meson >= 0.59.0
+        name = fs.stem('@0@'.format(sources[0]))
 
         exe = executable(
                 name,