diff --git a/metrics_utils.py b/metrics_utils.py
index 2235a7fd7..33f4e12b3 100644
--- a/metrics_utils.py
+++ b/metrics_utils.py
@@ -226,7 +226,7 @@ def extract_http_metrics(request_uri, method, status, response_time):
   if parsed_url.netloc in KNOWN_HTTP_HOSTS:
     http_metrics['host'] = parsed_url.netloc
 
-  for name, path_re in KNOWN_HTTP_PATHS.iteritems():
+  for name, path_re in KNOWN_HTTP_PATHS.items():
     if path_re.match(parsed_url.path):
       http_metrics['path'] = name
       break
@@ -287,7 +287,7 @@ def print_notice(countdown):
 def print_version_change(config_version):
   """Print a notice to let the user know we are collecting more metrics."""
   lines = list(get_notice_version_change_header())
-  for version in xrange(config_version + 1, CURRENT_VERSION + 1):
+  for version in range(config_version + 1, CURRENT_VERSION + 1):
     lines.append('')
     lines += list(get_change_notice(version))
   print_boxed_text(sys.stderr.write, 49, lines)
diff --git a/tests/metrics_test.py b/tests/metrics_test.py
index 37c884835..28b65d206 100644
--- a/tests/metrics_test.py
+++ b/tests/metrics_test.py
@@ -13,7 +13,6 @@ sys.path.insert(0, ROOT_DIR)
 
 import metrics
 import metrics_utils
-import cStringIO
 
 from third_party import mock