Commit 8561e484 neglected to handle
older Python versions that don't support the "with" statement.  So write
the tests in a way that older versions can handle as well.