Fix 2.4/2.2 tests for new allowDiskUse helper