--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -824,7 +824,7 @@
          # Find one service that exists, then check all the related 
interfaces.
          # I've ordered this by protocols that have both a tcp and udp
          # protocol, at least for modern Linuxes.
-        if (sys.platform.startswith(('freebsd', 'netbsd'))
+        if (sys.platform.startswith(('freebsd', 'netbsd', 'gnukfreebsd'))
              or sys.platform in ('linux', 'darwin')):
              # avoid the 'echo' service on this platform, as there is an
              # assumption breaking non-standard port/protocol entry
@@ -2534,7 +2534,7 @@
          self.createAndSendFDs(1)

      # Issue #12958: The following test has problems on Mac OS X
-    @support.anticipate_failure(sys.platform == "darwin")
+    @unittest.skipIf(sys.platform.startswith(('freebsd', 'darwin', 'gnukfreebsd')), "see issue #12958")
      @requireAttrs(socket, "CMSG_SPACE")
      def testFDPassSeparate(self):
          # Pass two FDs in two separate arrays.  Arrays may be combined
@@ -2544,7 +2544,7 @@
                               maxcmsgs=2)

      @testFDPassSeparate.client_skip
-    @support.anticipate_failure(sys.platform == "darwin")
+    @unittest.skipIf(sys.platform.startswith(('freebsd', 'darwin', 'gnukfreebsd')), "see issue #12958")
      def _testFDPassSeparate(self):
          fd0, fd1 = self.newFDs(2)
          self.assertEqual(
@@ -2557,7 +2557,7 @@
              len(MSG))

      # Issue #12958: The following test has problems on Mac OS X
-    @support.anticipate_failure(sys.platform == "darwin")
+    @unittest.skipIf(sys.platform.startswith(('freebsd', 'darwin', 'gnukfreebsd')), "see issue #12958")
      @requireAttrs(socket, "CMSG_SPACE")
      def testFDPassSeparateMinSpace(self):
          # Pass two FDs in two separate arrays, receiving them into the
@@ -2569,7 +2569,7 @@
                               maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)

      @testFDPassSeparateMinSpace.client_skip
-    @support.anticipate_failure(sys.platform == "darwin")
+    @unittest.skipIf(sys.platform.startswith(('freebsd', 'darwin', 'gnukfreebsd')), "see issue #12958")
      def _testFDPassSeparateMinSpace(self):
          fd0, fd1 = self.newFDs(2)
          self.assertEqual(