diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch
index 6e565e60d5..361d776217 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch
@@ -9,19 +9,22 @@ Content-Transfer-Encoding: 8bit
 It breaks configuration:
 | ../grilo-plugins-0.3.13/tests/tracker3/meson.build:5:0: ERROR: Program '/usr/lib/tracker-3.0/trackertestutils/tracker-sandbox' not found
 
+Without the testutils the tracker3 tests look for localsearch on the
+build host instead, so skip them altogether.
+
 Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 
 ---
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ meson.build       | 2 +-
+ tests/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index fca5f98..3c1aa06 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -98,7 +98,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required:
+@@ -99,7 +99,7 @@
  totem_plparser_mini_dep = dependency('totem-plparser-mini', version: '>= 3.4.1', required: false)
  tracker_sparql_dep = dependency('tracker-sparql-2.0', version: '>= 2.3.0', required: false)
  tracker3_dep = dependency('tracker-sparql-3.0', required: false)
@@ -30,3 +33,14 @@ index fca5f98..3c1aa06 100644
  
  lua_pkg = [
    'lua',
+diff --git a/tests/meson.build b/tests/meson.build
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -39,6 +39,6 @@
+     subdir('local-metadata')
+ endif
+ 
+-if get_option('enable-tracker3') != 'no' and tracker3_dep.found()
++if get_option('enable-tracker3') != 'no' and tracker3_dep.found() and tracker3_testutils_dep.found()
+     subdir('tracker3')
+ endif
diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.18.bb
similarity index 91%
rename from meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
rename to meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.18.bb
index a1d2262cae..cf25198d07 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.18.bb
@@ -13,7 +13,7 @@ DEPENDS = " \
 inherit gnomebase gnome-help vala
 
 SRC_URI += "file://0001-Avoid-running-trackertestutils.patch"
-SRC_URI[archive.sha256sum] = "fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb"
+SRC_URI[archive.sha256sum] = "8e3ce74ee717c3c322d0cb0f8df26bb0914028a5d016e28055ffb49cc9a46c5e"
 
 # gnome-online-accounts requires opengl by default, so lua-factory PACKAGECONFIG relies on opengl by default.
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)} \