Fix tests that failed on i686-win32 after r160248: