Fix the tests for Ubuntu 10.04.
Merge pull request #303 from apenney/fix-ubuntu-10-tests

Fix the tests for Ubuntu 10.04.