diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh
index 59d754e0..64ce55ad 100755
--- a/test/stdlib/runtests.sh
+++ b/test/stdlib/runtests.sh
@@ -6,9 +6,6 @@ FULLVERSION=$(pyenv local)
 PYVERSION=${FULLVERSION%.*}
 MINOR=${FULLVERSION##?.?.}
 
-# DECOMPILER=uncompyle2
-DECOMPILER="$fulldir/../../bin/uncompyle6"
-
 typeset -i STOP_ONERROR=1
 
 typeset -A SKIP_TESTS
@@ -20,9 +17,10 @@ case $PYVERSION in
 	    [test_codecs.py]=1    # need to fix tryelse
 	    [test_decorators.py]=1   # Syntax error decorators?
 	    [test_dis.py]=1   # We change line numbers - duh!
-	    [test_extcall.py]=1  # TypeError: saboteur() takes no arguments (1 given)
 	    [test_format.py]=1   # Control flow?
+	    [test_frozen.py]=1
 	    [test_grp.py]=1      # Long test - might work Control flow?
+	    [test_imp.py]=1   # Control flow?
 	    [test_import.py]=1   # Control flow?
 	    [test_long_future.py]=1 # Control flow?
 	    [test_math.py]=1 # Control flow?
@@ -35,22 +33,29 @@ case $PYVERSION in
 	;;
     2.5)
 	SKIP_TESTS=(
+	    [test_binop.py]=1  # need to fix tryelse
 	    [test_cgi.py]=1    # need to fix tryelse
 	    [test_codecs.py]=1    # need to fix tryelse
+	    [test_coercion.py]=1
+	    [test_contextlib.py]=1
 	    [test_decorators.py]=1   # Syntax error decorators?
 	    [test_dis.py]=1   # We change line numbers - duh!
 	    [test_exceptions.py]=1
-	    [test_extcall.py]=1  # TypeError: saboteur() takes no arguments (1 given)
 	    [test_format.py]=1   # Control flow?
+	    [test_frozen.py]=1
 	    [test_functools.py]=1
 	    [test_grammar.py]=1  # Too many stmts. Handle large stmts
 	    [test_grp.py]=1      # Long test - might work Control flow?
+	    [test_imp.py]=1
 	    [test_long_future.py]=1 # Control flow?
 	    [test_math.py]=1 # Control flow?
 	    [test_pwd.py]=1 # Long test - might work? Control flow?
 	    [test_queue.py]=1 # Control flow?
+	    [test_re.py]=1 # Probably Control flow?
 	    [test_sax.py]=1  # Control flow?
+	    [test_trace.py]=1  # Line numbers are expected to be different
 	    [test_types.py]=1 # Control flow?
+	    [test_zipfile64.py]=1  # Runs ok but takes 204 seconds
 	)
 	;;
     2.6)
@@ -123,6 +128,9 @@ esac
 srcdir=$(dirname $me)
 cd $srcdir
 fulldir=$(pwd)
+
+# DECOMPILER=uncompyle2
+DECOMPILER="$fulldir/../../bin/uncompyle6"
 TESTDIR=/tmp/test${PYVERSION}
 if [[ -e $TESTDIR ]] ; then
     rm -fr $TESTDIR