Integration test fix for 3.2