Try to fix tests failing on 1.6