Additional test fixes which affect Python 3.5 (and presumably later) but not
prior revisions of Python.

--- Lib/test/test_pathlib.py     2014-03-01 03:02:36.088311000 +0100
+++ Lib/test/test_pathlib.py     2014-03-01 04:56:37.768311000 +0100
@@ -1986,8 +1986,9 @@
         expect = set() if not support.fs_is_case_insensitive(BASE) else given
         self.assertEqual(given, expect)
         self.assertEqual(set(p.rglob("FILEd*")), set())
 
+    @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests")
     def test_expanduser(self):
         P = self.cls
         support.import_module('pwd')
         import pwd
--- Lib/test/test_tarfile.py        2016-02-24 19:22:52.597208055 +0000
+++ Lib/test/test_tarfile.py     2016-02-24 20:50:48.941950135 +0000
@@ -2305,11 +2305,14 @@
     try:
         import pwd, grp
     except ImportError:
         return False
-    if pwd.getpwuid(0)[0] != 'root':
-        return False
-    if grp.getgrgid(0)[0] != 'root':
+    try:
+        if pwd.getpwuid(0)[0] != 'root':
+            return False
+        if grp.getgrgid(0)[0] != 'root':
+            return False
+    except KeyError:
         return False
     return True


--- Lib/test/test_asyncio/test_base_events.py
+++ Lib/test/test_asyncio/test_base_events.py
@@ -1216,6 +1216,8 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
         self._test_create_connection_ip_addr(m_socket, False)
 
     @patch_socket
+    @unittest.skipUnless(support.is_resource_enabled('network'),
+                         'network is not enabled')
     def test_create_connection_service_name(self, m_socket):
         m_socket.getaddrinfo = socket.getaddrinfo
         sock = m_socket.socket.return_value
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index af5f00f..135ea5d 100644
--- Lib/test/test_shutil.py
+++ Lib/test/test_shutil.py
@@ -1145,6 +1145,7 @@ class TestShutil(unittest.TestCase):
         self.assertRaises(ValueError, make_archive, base_name, 'xxx')
 
     @requires_zlib
+    @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
     def test_make_archive_owner_group(self):
         # testing make_archive with owner and group, with various combinations
         # this works even if there's not gid/uid support
@@ -1173,6 +1174,7 @@ class TestShutil(unittest.TestCase):
 
 
     @requires_zlib
+    @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix")
     @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
     def test_tarfile_root_owner(self):
         root_dir, base_dir = self._create_files()
diff --git a/Lib/test/test_spwd.py b/Lib/test/test_spwd.py
index e893f3a..f07022b 100644
--- Lib/test/test_spwd.py
+++ Lib/test/test_spwd.py
@@ -58,6 +58,7 @@ class TestSpwdRoot(unittest.TestCase):
 
 @unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0,
                      'non-root user required')
+@unittest.skipIf(True, "assumes that /etc/shadow exists?")
 class TestSpwdNonRoot(unittest.TestCase):
 
     def test_getspnam_exception(self):