diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
index fec29a9e45..4ad27ec2b5 100644
--- a/etc/keystone.conf.sample
+++ b/etc/keystone.conf.sample
@@ -493,11 +493,10 @@
 # user_additional_attribute_mapping =
 
 [auth]
-methods = external,password,token,oauth1
-#external = keystone.auth.plugins.external.DefaultDomain
-password = keystone.auth.plugins.password.Password
-token = keystone.auth.plugins.token.Token
-oauth1 = keystone.auth.plugins.oauth1.OAuth
+# methods = external,password,token
+# external = keystone.auth.plugins.external.DefaultDomain
+# password = keystone.auth.plugins.password.Password
+# token = keystone.auth.plugins.token.Token
 
 [memcache]
 # servers = localhost:11211
@@ -512,5 +511,6 @@ oauth1 = keystone.auth.plugins.oauth1.OAuth
 # default_lock_timeout = 5
 
 [paste_deploy]
-# Name of the paste configuration file that defines the available pipelines
-config_file = keystone-paste.ini
+# Name of the paste configuration file, typically `keystone-paste.ini`, that
+# defines the available pipelines
+# config_file =
diff --git a/keystone/tests/test_overrides.conf b/keystone/tests/test_overrides.conf
index fe5d1fa077..d1f7bae143 100644
--- a/keystone/tests/test_overrides.conf
+++ b/keystone/tests/test_overrides.conf
@@ -27,3 +27,10 @@ ca_certs = examples/pki/certs/cacert.pem
 
 [kvs]
 backends = keystone.tests.test_kvs.KVSBackendForcedKeyMangleFixture, keystone.tests.test_kvs.KVSBackendFixture
+
+[auth]
+methods = external,password,token,oauth1
+oauth1 = keystone.auth.plugins.oauth1.OAuth
+
+[paste_deploy]
+config_file = keystone-paste.ini