diff --git a/keystone/templates/bin/_endpoint-update.py.tpl b/keystone/templates/bin/_endpoint-update.py.tpl
index f523c6269b..62794f836d 100644
--- a/keystone/templates/bin/_endpoint-update.py.tpl
+++ b/keystone/templates/bin/_endpoint-update.py.tpl
@@ -17,7 +17,10 @@ limitations under the License.
 #!/usr/bin/env python
 import os
 import sys
-import ConfigParser
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
 import logging
 from sqlalchemy import create_engine
 
diff --git a/keystone/templates/bin/_fernet-manage.py.tpl b/keystone/templates/bin/_fernet-manage.py.tpl
index a5ea3d6fa0..3fdc1b40b9 100644
--- a/keystone/templates/bin/_fernet-manage.py.tpl
+++ b/keystone/templates/bin/_fernet-manage.py.tpl
@@ -91,7 +91,7 @@ def read_from_files():
     for key in keys:
         with open(FERNET_DIR + key, 'r') as f:
             data[key] = f.read()
-    if len(keys):
+    if len(list(keys)):
         LOG.debug("Keys read from files: %s", keys)
     else:
         LOG.warn("No keys were read from files.")