diff --git a/py/emitcpy.c b/py/emitcpy.c
index 48c293091cd1b557e4b2f098fe2fc3352836fb72..dc96c529fbc9b7b6c8d437a9af5cdb8f421fcbc9 100644
--- a/py/emitcpy.c
+++ b/py/emitcpy.c
@@ -782,7 +782,7 @@ STATIC void emit_cpy_start_except_handler(emit_t *emit) {
 }
 
 STATIC void emit_cpy_end_except_handler(emit_t *emit) {
-    emit_cpy_adjust_stack_size(emit, -5); // stack adjust
+    emit_cpy_adjust_stack_size(emit, -2); // stack adjust
 }
 
 STATIC void emit_cpy_load_const_verbatim_strn(emit_t *emit, const char *str, mp_uint_t len) {
diff --git a/tests/bytecode/pylib-tests/compileall.py b/tests/bytecode/pylib-tests/compileall.py
index d3cff6a98ad2bb6943ae5d4bd1b399f2ee39395b..d92a322cf66bdf8f06317068d71f9e82cf661383 100644
--- a/tests/bytecode/pylib-tests/compileall.py
+++ b/tests/bytecode/pylib-tests/compileall.py
@@ -88,7 +88,7 @@ def compile_file(fullname, ddir=None, force=False, rx=None, quiet=False,
             return success
     if os.path.isfile(fullname):
         if legacy:
-            cfile = fullname + ('c' if __debug__ else 'o')
+            cfile = fullname + 'c'
         else:
             if optimize >= 0:
                 cfile = imp.cache_from_source(fullname,