This should be fixed in appscale/testing - try merging it in and seeing if we can remove this `except` and the next one.