Fix regression tests broken by 36966e8.

See https://travis-ci.org/GoogleCloudPlatform/gcloud-python/builds/40569737.
Merge pull request #367 from tseaver/347-fix_regression_tests_after_36966e8

Fix regression tests broken by 36966e8.