Fix test_I failure after merging PR#2446

See #2590, that's an alternative solution.