diff --git a/from_cpython/Lib/test/test_docxmlrpc.py b/from_cpython/Lib/test/test_docxmlrpc.py
index cb36f6eb3..80d18036a 100644
--- a/from_cpython/Lib/test/test_docxmlrpc.py
+++ b/from_cpython/Lib/test/test_docxmlrpc.py
@@ -1,4 +1,3 @@
-# expected: fail
 from DocXMLRPCServer import DocXMLRPCServer
 import httplib
 import sys
diff --git a/from_cpython/Lib/test/test_hashlib.py b/from_cpython/Lib/test/test_hashlib.py
index d9f6fad0e..dac945c97 100644
--- a/from_cpython/Lib/test/test_hashlib.py
+++ b/from_cpython/Lib/test/test_hashlib.py
@@ -1,4 +1,3 @@
-# expected: fail
 # Test hashlib module
 #
 # $Id$
diff --git a/from_cpython/Lib/test/test_poll.py b/from_cpython/Lib/test/test_poll.py
index 2c5823e62..1e195ed62 100644
--- a/from_cpython/Lib/test/test_poll.py
+++ b/from_cpython/Lib/test/test_poll.py
@@ -1,4 +1,3 @@
-# expected: fail
 # Test case for the os.poll() function
 
 import os
diff --git a/from_cpython/Lib/test/test_pyclbr.py b/from_cpython/Lib/test/test_pyclbr.py
index 474eeb203..c845b97d7 100644
--- a/from_cpython/Lib/test/test_pyclbr.py
+++ b/from_cpython/Lib/test/test_pyclbr.py
@@ -1,4 +1,6 @@
-# expected: fail
+# skip-if: True
+# - This test passes but takes an extremely long time in debug mode
+
 '''
    Test cases for pyclbr.py
    Nick Mathewson
diff --git a/from_cpython/Lib/test/test_readline.py b/from_cpython/Lib/test/test_readline.py
index ed60f58b3..945c7f40f 100644
--- a/from_cpython/Lib/test/test_readline.py
+++ b/from_cpython/Lib/test/test_readline.py
@@ -1,4 +1,3 @@
-# expected: fail
 """
 Very minimal unittests for parts of the readline module.
 
diff --git a/from_cpython/Lib/test/test_smtplib.py b/from_cpython/Lib/test/test_smtplib.py
index 87a0e432c..aa90eab85 100644
--- a/from_cpython/Lib/test/test_smtplib.py
+++ b/from_cpython/Lib/test/test_smtplib.py
@@ -1,4 +1,3 @@
-# expected: fail
 import asyncore
 import email.utils
 import socket
diff --git a/from_cpython/Lib/test/test_threadedtempfile.py b/from_cpython/Lib/test/test_threadedtempfile.py
index b8f2f580e..81d9687be 100644
--- a/from_cpython/Lib/test/test_threadedtempfile.py
+++ b/from_cpython/Lib/test/test_threadedtempfile.py
@@ -1,4 +1,3 @@
-# expected: fail
 """
 Create and delete FILES_PER_THREAD temp files (via tempfile.TemporaryFile)
 in each of NUM_THREADS threads, recording the number of successes and
diff --git a/test/CPYTHON_TEST_NOTES.md b/test/CPYTHON_TEST_NOTES.md
index 10cbe8703..b0ffff182 100644
--- a/test/CPYTHON_TEST_NOTES.md
+++ b/test/CPYTHON_TEST_NOTES.md
@@ -23,7 +23,7 @@ test_aifc               Unsupported subclassing from file?
 test_al                 No module named al
 test_applesingle        Not really a failure, but it tries to skip itself and we don't support that
 test_argparse           [unknown]
-test_ascii_formattd     [unknown]
+test_ascii_formatd      segfault in ctypes (but only on CI)
 test_ast                [unknown]
 test_asynchat           [unknown]
 test_asyncore           [unknown]
@@ -88,7 +88,6 @@ test_distutils          [unknown]
 test_dis                [unknown]
 test_dl                 [unknown]
 test_doctest            hard to know.  also missing some input files
-test_docxmlrpc          [unknown]
 test_dumbdbm            [unknown]
 test_email_codecs       [unknown]
 test_email_renamed      [unknown]
@@ -118,7 +117,6 @@ test_getargs2           [unknown]
 test_global             SyntaxWarnings for global statements after uses
 test_gl                 [unknown]
 test_grammar            bug in our tokenizer
-test_hashlib            [unknown]
 test_heapq              [unknown]
 test_hotshot            [unknown]
 test_httplib            [unknown]
@@ -172,13 +170,12 @@ test_pep352             various unique bugs
 test_pickletools        [unknown]
 test_pickle             unknown
 test_pkg                unknown bug
-test_poll               [unknown]
 test_poplib             [unknown]
 test_pprint             [unknown]
 test_print              [unknown]
 test_profile            [unknown]
 test_py3kwarn           [unknown]
-test_pyclbr             [unknown]
+test_pyclbr             This test passes but takes a very long time in debug mode (60s vs 5s for release mode).
 test_py_compile         [unknown]
 test_pydoc              [unknown]
 test_random             long("invalid number")
@@ -195,7 +192,6 @@ test_shelve             [unknown]
 test_shlex              [unknown]
 test_signal             [unknown]
 test_site               [unknown]
-test_smtplib            [unknown]
 test_smtpnet            [unknown]
 test_socketserver       [unknown]
 test_socket             [unknown]
@@ -225,7 +221,6 @@ test_tcl                [unknown]
 test_telnetlib          [unknown]
 test_tempfile           [unknown]
 test_threaded_import    [unknown]
-test_threadedtempfile   [unknown]
 test_threading_local    [unknown]
 test_threading          [unknown]
 test_threadsignals      [unknown]