diff --git a/src/test/meson.build b/src/test/meson.build
index 03635c2efc..21b1f435f4 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -547,6 +547,7 @@ executables += [
         core_test_template + {
                 'sources' : files('test-execute.c'),
                 'dependencies' : common_test_dependencies,
+                'type' : meson.is_cross_build() ? 'manual' : '',
                 'timeout' : 360,
         },
         core_test_template + {
diff --git a/src/ukify/test/meson.build b/src/ukify/test/meson.build
index 68be54e228..a5c7bbb37c 100644
--- a/src/ukify/test/meson.build
+++ b/src/ukify/test/meson.build
@@ -12,10 +12,15 @@ if want_ukify and want_tests != 'false'
                 args += ['--flakes']
         endif
 
+        efi_addon_for_test = ''
+        if not meson.is_cross_build() and efi_addon.length() > 0
+                efi_addon_for_test = efi_addon[0].full_path()
+        endif
+
         test('test-ukify',
              files('test_ukify.py'),
              args: args,
-             env : test_env + {'EFI_ADDON' : efi_addon.length() > 0 ? efi_addon[0].full_path() : ''},
+             env : test_env + {'EFI_ADDON' : efi_addon_for_test},
              timeout : 120,
              suite : 'ukify',
              depends : efi_addon)