diff -r c6d468e0ecc6 Lib/test/test_socket.py
--- a/Lib/test/test_socket.py	Fri Apr 17 21:18:49 2015 +0300
+++ b/Lib/test/test_socket.py	Fri Apr 17 20:23:55 2015 -0700
@@ -2749,7 +2749,7 @@
     def _testFDPassCMSG_LEN(self):
         self.createAndSendFDs(1)
 
-    @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
+    @unittest.skipUnless(sys.platform == "linux" or sys.platform.startswith("freebsd"), "skipping, unsupported")
     @requireAttrs(socket, "CMSG_SPACE")
     def testFDPassSeparate(self):
         # Pass two FDs in two separate arrays.  Arrays may be combined
@@ -2759,7 +2759,7 @@
                              maxcmsgs=2)
 
     @testFDPassSeparate.client_skip
-    @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
+    @unittest.skipUnless(sys.platform == "linux" or sys.platform.startswith("freebsd"), "skipping, unsupported")
     def _testFDPassSeparate(self):
         fd0, fd1 = self.newFDs(2)
         self.assertEqual(
@@ -2771,7 +2771,7 @@
                                           array.array("i", [fd1]))]),
             len(MSG))
 
-    @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
+    @unittest.skipUnless(sys.platform == "linux" or sys.platform.startswith("freebsd"), "skipping, unsupported")
     @requireAttrs(socket, "CMSG_SPACE")
     def testFDPassSeparateMinSpace(self):
         # Pass two FDs in two separate arrays, receiving them into the
@@ -2783,7 +2783,7 @@
                              maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)
 
     @testFDPassSeparateMinSpace.client_skip
-    @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")
+    @unittest.skipUnless(sys.platform == "linux" or sys.platform.startswith("freebsd"), "skipping, unsupported")
     def _testFDPassSeparateMinSpace(self):
         fd0, fd1 = self.newFDs(2)
         self.assertEqual(