Fix test codecs

Merged Bitbucket Importer requested to merge bitbucket/merged-pr-612 into branch/py3.6

Created originally on Bitbucket by Yusuke Tsutsumi

Was already merged in Bitbucket before import, marked as merged by the import user

I’m starting a branch to track fix_test_codecs, and hopefully get some help.

Merge request reports