diff --git a/lib/galaxy/authnz/managers.py b/lib/galaxy/authnz/managers.py
index d31b5c52b23..c2211b19e9a 100644
--- a/lib/galaxy/authnz/managers.py
+++ b/lib/galaxy/authnz/managers.py
@@ -109,7 +109,7 @@ class AuthnzManager(object):
     def _unify_provider_name(self, provider):
         if provider.lower() in self.oidc_backends_config:
             return provider.lower()
-        for k, v in BACKENDS_NAME.iteritems():
+        for k, v in BACKENDS_NAME.items():
             if v == provider:
                 return k.lower()
 
diff --git a/lib/galaxy/authnz/psa_authnz.py b/lib/galaxy/authnz/psa_authnz.py
index c4448ec3b27..06080f4bf13 100644
--- a/lib/galaxy/authnz/psa_authnz.py
+++ b/lib/galaxy/authnz/psa_authnz.py
@@ -82,7 +82,7 @@ DISCONNECT_PIPELINE = (
 class PSAAuthnz(IdentityProvider):
     def __init__(self, provider, oidc_config, oidc_backend_config):
         self.config = {'provider': provider.lower()}
-        for key, value in oidc_config.iteritems():
+        for key, value in oidc_config.items():
             self.config[setting_name(key)] = value
 
         self.config[setting_name('USER_MODEL')] = 'models.User'
diff --git a/lib/galaxy/util/create_history_template.py b/lib/galaxy/util/create_history_template.py
index 24a2b8c0deb..290c8f4495f 100644
--- a/lib/galaxy/util/create_history_template.py
+++ b/lib/galaxy/util/create_history_template.py
@@ -142,7 +142,7 @@ def inputs_recursive(trans, input_params, param_values, depth=1, upgrade_message
     if upgrade_messages is None:
         upgrade_messages = {}
 
-    for input_index, input in enumerate(input_params.itervalues()):
+    for input_index, input in enumerate(input_params.values()):
         if input.name in param_values:
             if input.type == "repeat":
                 for i in range(len(param_values[input.name])):
diff --git a/lib/galaxy/visualization/plugins/registry.py b/lib/galaxy/visualization/plugins/registry.py
index 88b10178aa5..8442484bad2 100644
--- a/lib/galaxy/visualization/plugins/registry.py
+++ b/lib/galaxy/visualization/plugins/registry.py
@@ -223,7 +223,7 @@ class VisualizationsRegistry(object):
 
     def get_plugins(self):
         result = []
-        for plugin in self.plugins.itervalues():
+        for plugin in self.plugins.values():
             result.append(plugin.to_dict())
         return sorted(result, key=lambda k: k.get('html'))
 
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
index b06bfa4841e..ab61b195479 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -558,7 +558,7 @@ class AdminGalaxy(controller.JSAppLauncher, AdminActions, UsesQuotaMixin, QuotaP
         )
 
         for data_table_elem_name, data_table in sorted_data_tables:
-            for filename, file_dict in data_table.filenames.iteritems():
+            for filename, file_dict in data_table.filenames.items():
                 file_missing = ['file missing'] \
                     if not file_dict.get('found') else []
                 data.append({
diff --git a/lib/galaxy/webapps/galaxy/controllers/data_manager.py b/lib/galaxy/webapps/galaxy/controllers/data_manager.py
index 493731321fc..fb5c47ce231 100644
--- a/lib/galaxy/webapps/galaxy/controllers/data_manager.py
+++ b/lib/galaxy/webapps/galaxy/controllers/data_manager.py
@@ -23,7 +23,7 @@ class DataManager(BaseUIController):
         message = kwd.get('message', '')
         status = kwd.get('status', 'info')
         data_managers = []
-        for data_manager_id, data_manager in sorted(trans.app.data_managers.data_managers.iteritems(),
+        for data_manager_id, data_manager in sorted(trans.app.data_managers.data_managers.items(),
                                                     key=lambda data_manager: data_manager[1].name):
             data_managers.append({'toolUrl': web.url_for(controller='root',
                                                          tool_id=data_manager.tool.id),