Fix tests for 2.2.6, 2.4.9, and 2.5.x