diff --git a/ASTree.cpp b/ASTree.cpp
index 0cc1314a3..e12e32e23 100644
--- a/ASTree.cpp
+++ b/ASTree.cpp
@@ -1885,6 +1885,7 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
             }
             break;
         case Pyc::WITH_CLEANUP:
+        case Pyc::WITH_CLEANUP_START:
             {
                 // Stack top should be a None. Ignore it.
                 PycRef<ASTNode> none = stack.top();
@@ -1907,6 +1908,9 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
                 }
             }
             break;
+        case Pyc::WITH_CLEANUP_FINISH:
+            /* Ignore this */
+            break;
         case Pyc::SETUP_EXCEPT_A:
             {
                 if (curblock->blktype() == ASTBlock::BLK_CONTAINER) {
diff --git a/tests/xfail/test_with.3.4.pyc b/tests/xfail/test_with.3.4.pyc
new file mode 100644
index 000000000..1142a853e
Binary files /dev/null and b/tests/xfail/test_with.3.4.pyc differ
diff --git a/tests/xfail/test_with.3.5.pyc b/tests/xfail/test_with.3.5.pyc
new file mode 100644
index 000000000..e826aa718
Binary files /dev/null and b/tests/xfail/test_with.3.5.pyc differ