Issue #1089: Fix a couple of failing tests on Linux.