diff --git a/src/test/meson.build b/src/test/meson.build
index 286fcac5c7..e99605af72 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -12,7 +12,9 @@ generated_sources += test_hashmap_ordered_c
 
 path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip()
 test_env = environment()
-test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
+if conf.get('ENABLE_LOCALED') == 1
+        test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
+endif
 test_env.set('PATH', meson.project_build_root() + ':' + path)
 test_env.set('PROJECT_BUILD_ROOT', meson.project_build_root())
 test_env.set('SYSTEMD_SLOW_TESTS', want_slow_tests ? '1' : '0')
diff --git a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
index 76b0ebeb87..0b1b3d9a97 100644
--- a/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
+++ b/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
@@ -7,7 +7,10 @@ udev_storage_test_template = {
 }
 
 qemu = find_program('qemu-system-@0@'.format(host_machine.cpu_family()), 'qemu-kvm', dirs : ['/usr/libexec'], native : true, required : false)
-if qemu.found()
+if qemu.found() and host_machine.cpu_family() == 'aarch64'
+        # qemu-system-aarch64 errors out if no machine is specified
+        devices = run_command(qemu, '-device', 'help', '-machine', 'virt', check : true).stdout().strip()
+elif qemu.found()
         devices = run_command(qemu, '-device', 'help', check : true).stdout().strip()
 else
         devices = ''