Fix test running against current 2.4 release