diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index ea534cd9cd74..533ee648ec0f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -35,7 +35,7 @@ PORTSCOUT=	limitw:1,even
 _LIBVERSION=	0.6800.3
 PLIST_SUB=	LIBVERSION=${_LIBVERSION}
 
-OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
+OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS TEST
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
@@ -46,6 +46,9 @@ MANPAGES_BUILD_DEPENDS=	docbook-xml>4.1.2:textproc/docbook-xml \
 MANPAGES_USE=		GNOME=libxslt:build
 MANPAGES_MESON_TRUE=	man
 
+TEST_DEPENDS=		dbus-daemon:devel/dbus
+TEST_MESON_TRUE=	tests
+
 .include <bsd.port.pre.mk>
 
 # doesn't build yet
diff --git a/devel/glib20/files/patch-gio_tests_meson.build b/devel/glib20/files/patch-gio_tests_meson.build
new file mode 100644
index 000000000000..435c5afe7f2d
--- /dev/null
+++ b/devel/glib20/files/patch-gio_tests_meson.build
@@ -0,0 +1,61 @@
+--- gio/tests/meson.build.orig	2021-06-10 18:57:57 UTC
++++ gio/tests/meson.build
+@@ -49,7 +49,6 @@ gio_tests = {
+   'buffered-output-stream' : {},
+   'cancellable' : {},
+   'contexts' : {},
+-  'contenttype' : {},
+   'converter-stream' : {},
+   'credentials' : {},
+   'data-input-stream' : {},
+@@ -94,7 +93,6 @@ gio_tests = {
+   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
+   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
+   'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
+-  'gdbus-address-get-session' : {},
+   'win32-appinfo' : {},
+ }
+ 
+@@ -151,10 +149,6 @@ endif
+ if host_machine.system() != 'windows'
+   gio_tests += {
+     'file' : {},
+-    'gdbus-peer' : {
+-      'dependencies' : [libgdbus_example_objectmanager_dep],
+-      'install_rpath' : installed_tests_execdir
+-    },
+     'gdbus-peer-object-manager' : {},
+     'live-g-file' : {},
+     'socket-address' : {},
+@@ -190,31 +184,14 @@ if host_machine.system() != 'windows'
+     }
+   endif
+ 
+-  # Uninstalled because of the check-for-executable logic in DesktopAppInfo
+-  # unable to find the installed executable
+-  if not glib_have_cocoa
+-    gio_tests += {
+-      'appinfo' : {
+-        'install' : false,
+-      },
+-      'desktop-app-info' : {
+-        'install' : false,
+-      },
+-    }
+-  endif
+-
+   test_extra_programs += {
+     'basic-application' : {},
+     'dbus-launch' : {},
+-    'appinfo-test' : {},
+   }
+ 
+   if not glib_have_cocoa
+     test_extra_programs += {
+       'apps' : {},
+-    }
+-    gio_tests += {
+-      'mimeapps' : {},
+     }
+   endif
+