3 files changed, 14 insertions, 12 deletions
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
index b528dca7c..2dce40d29 100644
--- a/test cases/frameworks/1 boost/meson.build
+++ b/test cases/frameworks/1 boost/meson.build
@@ -40,14 +40,10 @@ if(python2dep.found() and host_machine.system() == 'linux')
     # on the installed version of python (and hope that they match the version boost
     # was compiled against)
     py2version_string = ''.join(python2dep.version().split('.'))
-    bpython2dep = dependency('boost', modules : ['python' + py2version_string])
+    bpython2dep = dependency('boost', modules : ['python' + py2version_string], required: false, disabler: true)
   else
     # if we have an older version of boost, we need to use the old module names
-    bpython2dep = dependency('boost', modules : ['python'])
-  endif
-
-  if not (bpython2dep.found())
-    bpython2dep = disabler()
+    bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true)
   endif
 else
   python2dep = disabler()
@@ -57,13 +53,9 @@ endif
 if(python3dep.found() and host_machine.system() == 'linux')
   if(dep.version().version_compare('>=1.67'))
     py3version_string = ''.join(python3dep.version().split('.'))
-    bpython3dep = dependency('boost', modules : ['python' + py3version_string])
+    bpython3dep = dependency('boost', modules : ['python' + py3version_string], required: false, disabler: true)
   else
-    bpython3dep = dependency('boost', modules : ['python3'])
-  endif
-
-  if not (bpython3dep.found())
-    bpython3dep = disabler()
+    bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true)
   endif
 else
   python3dep = disabler()
diff --git a/test cases/frameworks/6 gettext/meson.build b/test cases/frameworks/6 gettext/meson.build
index 09ef9829e..afa24b1d5 100644
--- a/test cases/frameworks/6 gettext/meson.build
+++ b/test cases/frameworks/6 gettext/meson.build
@@ -5,6 +5,11 @@ if not gettext.found()
   error('MESON_SKIP_TEST gettext not found.')
 endif
 
+xgettext = find_program('xgettext', required: false)
+if not xgettext.found()
+  error('MESON_SKIP_TEST xgettext not found.')
+endif
+
 if not meson.get_compiler('c').has_header('libintl.h')
   error('MESON_SKIP_TEST libintl.h not found.')
 endif
diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build
index 03335b885..e7ba56578 100644
--- a/test cases/frameworks/7 gnome/meson.build
+++ b/test cases/frameworks/7 gnome/meson.build
@@ -5,6 +5,11 @@ if not glib.found()
   error('MESON_SKIP_TEST glib not found.')
 endif
 
+gir = dependency('gobject-introspection-1.0', required: false)
+if not gir.found()
+  error('MESON_SKIP_TEST gobject-introspection not found.')
+endif
+
 python3 = import('python3')
 py3 = python3.find_python()
 if run_command(py3, '-c', 'import gi;').returncode() != 0