diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index ebdd3bc..1d02141 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -670,9 +670,6 @@
 
     @unittest.skipUnless(hasattr(signal, 'sigtimedwait'),
                          'need signal.sigtimedwait()')
-    # issue #12303: sigtimedwait() takes 30 seconds on FreeBSD 6 (kernel bug)
-    @unittest.skipIf(sys.platform =='freebsd6',
-        "sigtimedwait() with a null timeout doens't work on FreeBSD 6")
     def test_sigtimedwait_poll(self):
         # check that polling with sigtimedwait works
         self.wait_helper(signal.SIGALRM, '''
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index fe9dde6..4b61e18 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -144,10 +144,7 @@
  * Initialization.
  */
 
-/* On FreeBSD6, pthread_kill() doesn't work on the main thread before
-   the creation of the first thread */
-#if defined(_HAVE_BSDI) \
-    || (defined(__FreeBSD__) && __FreeBSD_version < 700000)
+#if defined(_HAVE_BSDI)
 static
 void _noop(void)
 {