This reverts commit 31a91823. These changes should be made to the test environment, not the tests themselves.