Making test_hive more robust in the face of continuous builds.