diff --git a/test/bytecode_2.7_run/05_not_unconditional.pyc-notyet b/test/bytecode_2.7_run/05_not_unconditional.pyc
similarity index 100%
rename from test/bytecode_2.7_run/05_not_unconditional.pyc-notyet
rename to test/bytecode_2.7_run/05_not_unconditional.pyc
diff --git a/test/bytecode_3.5/06_while_return.pyc-notyet b/test/bytecode_3.5/06_while_return.pyc-notyet
deleted file mode 100644
index 2f265c4f..00000000
Binary files a/test/bytecode_3.5/06_while_return.pyc-notyet and /dev/null differ
diff --git a/test/bytecode_3.5/10_while.pyc-notyet b/test/bytecode_3.5/10_while.pyc
similarity index 100%
rename from test/bytecode_3.5/10_while.pyc-notyet
rename to test/bytecode_3.5/10_while.pyc
diff --git a/test/ok_lib2.7/cmd.pyc-notyet b/test/ok_lib2.7/cmd.pyc
similarity index 100%
rename from test/ok_lib2.7/cmd.pyc-notyet
rename to test/ok_lib2.7/cmd.pyc
diff --git a/test/ok_lib2.7/codeop.pyc_notyet b/test/ok_lib2.7/codeop.pyc
similarity index 100%
rename from test/ok_lib2.7/codeop.pyc_notyet
rename to test/ok_lib2.7/codeop.pyc
diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh
index 9189dfae..62e8db59 100755
--- a/test/stdlib/runtests.sh
+++ b/test/stdlib/runtests.sh
@@ -133,21 +133,24 @@ case $PYVERSION in
 
 	    [test_capi.py]=1
 	    [test_curses.py]=1  # Possibly fails on its own but not detected
+	    [test test_cmd_line.py]=1 # Takes too long, maybe hangs, or looking for interactive input?
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_doctest.py]=1 # Fails on its own
 	    [test_exceptions.py]=1
 	    [test_format.py]=1  # control flow. uncompyle2 does not have problems here
+	    [test_frozen.py]=1  # try vs try/else control flow. uncompyle2 does not have problems here
 	    [test_generators.py]=1  # control flow. uncompyle2 has problem here too
 	    [test_grammar.py]=1     # Too many stmts. Handle large stmts
+	    [test_grp.py]=1     # test takes to long, works interactively though
+	    [test_hashlib.py]=1 # Investiage
 	    [test_io.py]=1 # Test takes too long to run
 	    [test_ioctl.py]=1 # Test takes too long to run
-	    [test_itertools.py]=1 # Fix erroneous reduction to "conditional_true".
-	                          # See test/simple_source/bug27+/05_not_unconditional.py
 	    [test_long.py]=1
 	    [test_long_future.py]=1
 	    [test_math.py]=1
 	    [test_memoryio.py]=1 # FIX
-	    [test_multiprocessing.py]=1 # On uncompyle2, taks 24 secs
+	    [test_modulefinder.py]=1 # FIX
+	    [test_multiprocessing.py]=1 # On uncompyle2, takes 24 secs
 	    [test_pep352.py]=1  # ?
 	    [test_posix.py]=1   # Bug in try-else detection inside test_initgroups()
 	                        # Deal with when we have better flow-control detection