OC-8337: Fix 32-bit OS test breaks