Master test fixes

With these two changes, the testsuite passes on my CentOS 6 box.
...
Ran 2419 tests in 45.666s

OK