Make the runtest script adjust a couple of files for py3/py2 differences
    
    This makes sure we are using py3 or py2 consistently in the tests when
    checking only one of these.
    
    Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr></pingou@pingoured.fr>