diff --git a/dev-python/pygobject-base/Manifest b/dev-python/pygobject-base/Manifest
index c72e1822a..d610b365c 100644
--- a/dev-python/pygobject-base/Manifest
+++ b/dev-python/pygobject-base/Manifest
@@ -1 +1 @@
-DIST pygobject-3.16.2.tar.xz 725544 SHA256 de620e00fe7ecb788aa2dc0d664e41f71b8e718e728168e8d982cf193a9e7e64 SHA512 9a742db4b05fdf0cf2b7bb9139d5f43b4a4e25b4652e8bd3aa8d6f64b03b745b57c047dfc95335045126d0dd4c797989d95d6a1bdb4752cab8e04146470653bf WHIRLPOOL d39b5f23ca33f4331582fd8229a348db679b1db1b9f5daff2639a03ec70f31bfcf2f7ac7a67cc3d54a2444faa228b878fdd9556110af10c3246087a634ba88e3
+DIST pygobject-3.18.2.tar.xz 730220 SHA256 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f SHA512 8001efdbfb07caa23d2e1024e90c5db7478468b2e8de319fb25695e69e5898524ebccc8b69edcedb71ff02d9fe333448986cc5a22014f8661230fd5acdffa19e WHIRLPOOL fe3002baaf7ef347efa7e3c0c1d22c5c5927133a8b86ebf7a634cae0517eab16eac38fe7c34e513ebdabce4993674ec3cac63a0fc2445d718e9d0bfbf95300fc
diff --git a/dev-python/pygobject-base/files/3.16.1-unittest.patch b/dev-python/pygobject-base/files/3.16.1-unittest.patch
deleted file mode 100644
index 5ee15b1dd..000000000
--- a/dev-python/pygobject-base/files/3.16.1-unittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Comment out unittest that ought to work but for some reason does not want to.
-
---- a/tests/test_glib.py	2015-05-10 14:01:45.873164005 +0200
-+++ b/tests/test_glib.py	2015-03-05 09:32:55.000000000 +0100
-@@ -38,8 +38,8 @@
-     def test_xdg_dirs(self):
-         d = GLib.get_user_data_dir()
-         self.assertTrue('/' in d, d)
--        d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
--        self.assertTrue('/' in d, d)
-+        #d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
-+        #self.assertTrue('/' in d, d)
-         with warnings.catch_warnings():
-             warnings.simplefilter('ignore', PyGIDeprecationWarning)
- 
diff --git a/dev-python/pygobject-base/pygobject-base-3.16.2.ebuild b/dev-python/pygobject-base/pygobject-base-3.18.2.ebuild
similarity index 97%
rename from dev-python/pygobject-base/pygobject-base-3.16.2.ebuild
rename to dev-python/pygobject-base/pygobject-base-3.18.2.ebuild
index c210e743f..a0bc3a5f8 100644
--- a/dev-python/pygobject-base/pygobject-base-3.16.2.ebuild
+++ b/dev-python/pygobject-base/pygobject-base-3.18.2.ebuild
@@ -50,8 +50,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	# Comment out broken unittest
-	epatch "${FILESDIR}"/3.16.1-unittest.patch
 	gnome2_src_prepare
 	python_copy_sources
 }
@@ -84,6 +82,7 @@ src_test() {
 	export GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
 	export GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
 	export SKIP_PEP8="yes"
+
 	testing() {
 		export XDG_CACHE_HOME="${T}/${EPYTHON}"
 		run_in_build_dir Xemake check
diff --git a/dev-python/pygobject-cairo/Manifest b/dev-python/pygobject-cairo/Manifest
index c72e1822a..d610b365c 100644
--- a/dev-python/pygobject-cairo/Manifest
+++ b/dev-python/pygobject-cairo/Manifest
@@ -1 +1 @@
-DIST pygobject-3.16.2.tar.xz 725544 SHA256 de620e00fe7ecb788aa2dc0d664e41f71b8e718e728168e8d982cf193a9e7e64 SHA512 9a742db4b05fdf0cf2b7bb9139d5f43b4a4e25b4652e8bd3aa8d6f64b03b745b57c047dfc95335045126d0dd4c797989d95d6a1bdb4752cab8e04146470653bf WHIRLPOOL d39b5f23ca33f4331582fd8229a348db679b1db1b9f5daff2639a03ec70f31bfcf2f7ac7a67cc3d54a2444faa228b878fdd9556110af10c3246087a634ba88e3
+DIST pygobject-3.18.2.tar.xz 730220 SHA256 2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f SHA512 8001efdbfb07caa23d2e1024e90c5db7478468b2e8de319fb25695e69e5898524ebccc8b69edcedb71ff02d9fe333448986cc5a22014f8661230fd5acdffa19e WHIRLPOOL fe3002baaf7ef347efa7e3c0c1d22c5c5927133a8b86ebf7a634cae0517eab16eac38fe7c34e513ebdabce4993674ec3cac63a0fc2445d718e9d0bfbf95300fc
diff --git a/dev-python/pygobject-cairo/files/3.16.1-unittest.patch b/dev-python/pygobject-cairo/files/3.16.1-unittest.patch
deleted file mode 100644
index 5ee15b1dd..000000000
--- a/dev-python/pygobject-cairo/files/3.16.1-unittest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Comment out unittest that ought to work but for some reason does not want to.
-
---- a/tests/test_glib.py	2015-05-10 14:01:45.873164005 +0200
-+++ b/tests/test_glib.py	2015-03-05 09:32:55.000000000 +0100
-@@ -38,8 +38,8 @@
-     def test_xdg_dirs(self):
-         d = GLib.get_user_data_dir()
-         self.assertTrue('/' in d, d)
--        d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
--        self.assertTrue('/' in d, d)
-+        #d = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
-+        #self.assertTrue('/' in d, d)
-         with warnings.catch_warnings():
-             warnings.simplefilter('ignore', PyGIDeprecationWarning)
- 
diff --git a/dev-python/pygobject-cairo/pygobject-cairo-3.16.2.ebuild b/dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild
similarity index 96%
rename from dev-python/pygobject-cairo/pygobject-cairo-3.16.2.ebuild
rename to dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild
index 8f5c4bf8c..e0ae91a14 100644
--- a/dev-python/pygobject-cairo/pygobject-cairo-3.16.2.ebuild
+++ b/dev-python/pygobject-cairo/pygobject-cairo-3.18.2.ebuild
@@ -36,8 +36,6 @@ RDEPEND="${COMMON_DEPEND}
 # gnome-base/gnome-common required by eautoreconf
 
 src_prepare() {
-	# Comment out broken unittest
-	epatch "${FILESDIR}"/3.16.1-unittest.patch
 	gnome2_src_prepare
 	python_copy_sources
 }
diff --git a/dev-python/pygobject/pygobject-3.16.2.ebuild b/dev-python/pygobject/pygobject-3.18.2.ebuild
similarity index 100%
rename from dev-python/pygobject/pygobject-3.16.2.ebuild
rename to dev-python/pygobject/pygobject-3.18.2.ebuild