diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index 04d278db3..2716c8981 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -614,6 +614,8 @@ g_content_type_get_generic_icon_name (const gchar *type)
   const gchar *xdg_icon_name;
   gchar *icon_name;
 
+  g_return_val_if_fail (type != NULL, NULL);
+
   G_LOCK (gio_xdgmime);
   xdg_icon_name = xdg_mime_get_generic_icon (type);
   G_UNLOCK (gio_xdgmime);
diff --git a/gio/gdummytlsbackend.c b/gio/gdummytlsbackend.c
index 52342d957..8744b8363 100644
--- a/gio/gdummytlsbackend.c
+++ b/gio/gdummytlsbackend.c
@@ -235,7 +235,9 @@ enum
   PROP_CONN_SERVER_IDENTITY,
   PROP_CONN_USE_SSL3,
   PROP_CONN_ACCEPTED_CAS,
-  PROP_CONN_AUTHENTICATION_MODE
+  PROP_CONN_AUTHENTICATION_MODE,
+  PROP_CONN_ADVERTISED_PROTOCOLS,
+  PROP_CONN_NEGOTIATED_PROTOCOL,
 };
 
 static void g_dummy_tls_connection_initable_iface_init (GInitableIface *iface);
@@ -301,6 +303,8 @@ g_dummy_tls_connection_class_init (GDummyTlsConnectionClass *connection_class)
   g_object_class_override_property (gobject_class, PROP_CONN_USE_SSL3, "use-ssl3");
   g_object_class_override_property (gobject_class, PROP_CONN_ACCEPTED_CAS, "accepted-cas");
   g_object_class_override_property (gobject_class, PROP_CONN_AUTHENTICATION_MODE, "authentication-mode");
+  g_object_class_override_property (gobject_class, PROP_CONN_ADVERTISED_PROTOCOLS, "advertised-protocols");
+  g_object_class_override_property (gobject_class, PROP_CONN_NEGOTIATED_PROTOCOL, "negotiated-protocol");
 }
 
 static void
diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in
index 43c6c63fd..675024a50 100755
--- a/gio/tests/memory-monitor-dbus.py.in
+++ b/gio/tests/memory-monitor-dbus.py.in
@@ -38,6 +38,12 @@ class TestLowMemoryMonitor(dbusmock.DBusTestCase):
         klass.dbus_con = klass.get_dbus(True)
 
     def setUp(self):
+        try:
+            Gio.MemoryMonitor
+        except AttributeError:
+            raise unittest.SkipTest('Low memory monitor not in '
+                                    'introspection data. Requires '
+                                    'GObject-Introspection ≥ 1.63.2')
         try:
             (self.p_mock, self.obj_lmm) = self.spawn_server_template(
                 'low_memory_monitor', {}, stdout=subprocess.PIPE)
diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in
index 8572d8f69..37c206fd4 100755
--- a/gio/tests/memory-monitor-portal.py.in
+++ b/gio/tests/memory-monitor-portal.py.in
@@ -40,6 +40,12 @@ class TestLowMemoryMonitorPortal(dbusmock.DBusTestCase):
         klass.start_session_bus()
 
     def setUp(self):
+        try:
+            Gio.MemoryMonitor
+        except AttributeError:
+            raise unittest.SkipTest('Low memory monitor not in '
+                                    'introspection data. Requires '
+                                    'GObject-Introspection ≥ 1.63.2')
         try:
             (self.p_mock, self.obj_lmm) = self.spawn_server_template(
                 'low_memory_monitor', {}, stdout=subprocess.PIPE)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 695ad1f8f..788cf978b 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -521,33 +521,33 @@ if installed_tests_enabled
   )
   install_subdir('static-link', install_dir : installed_tests_execdir)
   install_data('static-link.py', install_dir : installed_tests_execdir)
+
+  memory_monitor_tests = [
+    'memory-monitor-dbus',
+    'memory-monitor-portal',
+  ]
+
+  foreach memory_monitor_test : memory_monitor_tests
+    cdata = configuration_data()
+    cdata.set('installed_tests_dir', installed_tests_execdir)
+    cdata.set('program', memory_monitor_test + '.py')
+    configure_file(
+      input: installed_tests_template,
+      output: memory_monitor_test + '.test',
+      install_dir: installed_tests_metadir,
+      configuration: cdata
+    )
+    cdata = configuration_data()
+    cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
+    configure_file(
+      input: memory_monitor_test + '.py.in',
+      output: memory_monitor_test + '.py',
+      install_dir : installed_tests_execdir,
+      configuration: cdata,
+    )
+  endforeach
 endif
 
-memory_monitor_tests = [
-  'memory-monitor-dbus',
-  'memory-monitor-portal',
-]
-
-foreach memory_monitor_test : memory_monitor_tests
-  cdata = configuration_data()
-  cdata.set('installed_tests_dir', installed_tests_execdir)
-  cdata.set('program', memory_monitor_test + '.py')
-  configure_file(
-    input: installed_tests_template,
-    output: memory_monitor_test + '.test',
-    install_dir: installed_tests_metadir,
-    configuration: cdata
-  )
-  cdata = configuration_data()
-  cdata.set('libexecdir', join_paths(glib_prefix, get_option('libexecdir')))
-  configure_file(
-    input: memory_monitor_test + '.py.in',
-    output: memory_monitor_test + '.py',
-    install_dir : installed_tests_execdir,
-    configuration: cdata,
-  )
-endforeach
-
 if not meson.is_cross_build() or meson.has_exe_wrapper()
 
   plugin_resources_c = custom_target('plugin-resources.c',