diff --git a/test cases/frameworks/11 gir subproject/gir/meson.build b/test cases/frameworks/11 gir subproject/gir/meson.build
index e92c64163..48e0a47a0 100644
--- a/test cases/frameworks/11 gir subproject/gir/meson.build	
+++ b/test cases/frameworks/11 gir subproject/gir/meson.build	
@@ -28,8 +28,10 @@ gnome.generate_gir(
 
 message('TEST: ' + girsubproject.outdir())
 
+envdata = environment()
+envdata.append('GI_TYPELIB_PATH', girsubproject.outdir(), 'subprojects/mesongir', separator : ':')
+envdata.append('LD_LIBRARY_PATH', girsubproject.outdir(), 'subprojects/mesongir')
+
 test('gobject introspection/subproject/c', girexe)
 test('gobject introspection/subproject/py', find_program('prog.py'),
-     env : ['GI_TYPELIB_PATH=' + girsubproject.outdir() + ':subprojects/mesongir',
-            'LD_LIBRARY_PATH=' + girsubproject.outdir() + ':subprojects/mesongir',
-     ])
+     env : envdata)
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build
index beddc8183..f3a453433 100644
--- a/test cases/frameworks/7 gnome/gir/meson.build	
+++ b/test cases/frameworks/7 gnome/gir/meson.build	
@@ -33,7 +33,8 @@ gnome.generate_gir(
 
 test('gobject introspection/c', girexe)
 gir_paths = ':'.join([girlib.outdir(), dep1lib.outdir(), dep2lib.outdir()])
+envdata = environment()
+envdata.append('GI_TYPELIB_PATH', gir_paths, separator : ':')
+envdata.append('LD_LIBRARY_PATH', gir_paths)
 test('gobject introspection/py', find_program('prog.py'),
-     env : ['GI_TYPELIB_PATH=' + gir_paths, 
-            'LD_LIBRARY_PATH=' + gir_paths,
-     ])
+     env : envdata)
diff --git a/test cases/frameworks/7 gnome/meson.build b/test cases/frameworks/7 gnome/meson.build
index a771e71b7..c75c0490f 100644
--- a/test cases/frameworks/7 gnome/meson.build	
+++ b/test cases/frameworks/7 gnome/meson.build	
@@ -1,5 +1,14 @@
 project('gobject-introspection', 'c')
 
+cc = meson.get_compiler('c')
+
+add_global_arguments('-DMESON_TEST', language : 'c')
+if cc.get_id() == 'intel'
+  # Ignore invalid GCC pragma warnings from glib
+  # https://bugzilla.gnome.org/show_bug.cgi?id=776562
+  add_global_arguments('-wd2282', language : 'c')
+endif
+
 gnome = import('gnome')
 gio = dependency('gio-2.0')
 giounix = dependency('gio-unix-2.0')
@@ -7,7 +16,6 @@ glib = dependency('glib-2.0')
 gobj = dependency('gobject-2.0')
 gir = dependency('gobject-introspection-1.0')
 gmod = dependency('gmodule-2.0')
-add_global_arguments('-DMESON_TEST', language : 'c')
 
 subdir('resources-data')
 subdir('resources')