diff --git a/keystoneauth1/identity/generic/base.py b/keystoneauth1/identity/generic/base.py
index a41c0f36..603767ea 100644
--- a/keystoneauth1/identity/generic/base.py
+++ b/keystoneauth1/identity/generic/base.py
@@ -136,9 +136,9 @@ class BaseGenericPlugin(base.BaseIdentityPlugin):
         except (exceptions.DiscoveryFailure,
                 exceptions.HttpError,
                 exceptions.ConnectionError):
-            LOG.warning('Discovering versions from the identity service '
-                        'failed when creating the password plugin. '
-                        'Attempting to determine version from URL.')
+            LOG.warning('Failed to discover available identity versions when '
+                        'contacting %s. Attempting to parse version from URL.',
+                        self.auth_url)
 
             url_parts = urlparse.urlparse(self.auth_url)
             path = url_parts.path.lower()
diff --git a/keystoneauth1/tests/unit/identity/utils.py b/keystoneauth1/tests/unit/identity/utils.py
index 56a834a9..89883b5b 100644
--- a/keystoneauth1/tests/unit/identity/utils.py
+++ b/keystoneauth1/tests/unit/identity/utils.py
@@ -121,6 +121,7 @@ class GenericPluginTestCase(utils.TestCase):
     def test_disc_error_for_failure(self):
         self.stub_url('GET', [], status_code=403)
         self.assertDiscoveryFailure()
+        self.assertIn(self.TEST_URL, self.logger.output)
 
     def test_v3_plugin_from_failure(self):
         url = self.TEST_URL + 'v3'