Merge pull request #2209 from benbc/2.0-always-start-with-a-clean-test-directory

Always start with a clean test directory.
Merge commit 'eb1849d' into 2.0-merge-1.9