diff --git a/vcsserver/echo_stub/echo_app.py b/vcsserver/echo_stub/echo_app.py
--- a/vcsserver/echo_stub/echo_app.py
+++ b/vcsserver/echo_stub/echo_app.py
@@ -41,7 +41,7 @@ class EchoAppStream(object):
         start_response(status, headers)
 
         def generator():
-            for _ in xrange(1000000):
+            for _ in range(1000000):
                 yield "ECHO"
         return generator()
 
diff --git a/vcsserver/hg.py b/vcsserver/hg.py
--- a/vcsserver/hg.py
+++ b/vcsserver/hg.py
@@ -703,7 +703,7 @@ class HgRemote(RemoteBase):
                 return len(repo) - 1, 0
 
         stop, start = get_revs(repo, [node + ':'])
-        revs = [hex(repo[r].node()) for r in xrange(start, stop + 1)]
+        revs = [hex(repo[r].node()) for r in range(start, stop + 1)]
         return revs
 
     @reraise_safe_exceptions
diff --git a/vcsserver/hooks.py b/vcsserver/hooks.py
--- a/vcsserver/hooks.py
+++ b/vcsserver/hooks.py
@@ -219,7 +219,7 @@ def _check_heads(repo, start, end, commi
         # The heads descending from that parent, on the same branch
         parent_heads = set([p])
         reachable = set([p])
-        for x in xrange(p + 1, end):
+        for x in range(p + 1, end):
             if get_ctx(repo, x).branch() != branch:
                 continue
             for pp in changelog.parentrevs(x):
diff --git a/vcsserver/pygrack.py b/vcsserver/pygrack.py
--- a/vcsserver/pygrack.py
+++ b/vcsserver/pygrack.py
@@ -212,7 +212,7 @@ class GitRepository(object):
             return
 
         chunker = (
-            data[i:i + chunk_size] for i in xrange(0, len(data), chunk_size))
+            data[i:i + chunk_size] for i in range(0, len(data), chunk_size))
 
         for chunk in chunker:
             proto.write_sideband(2, chunk)
diff --git a/vcsserver/tests/test_http_performance.py b/vcsserver/tests/test_http_performance.py
--- a/vcsserver/tests/test_http_performance.py
+++ b/vcsserver/tests/test_http_performance.py
@@ -27,13 +27,13 @@ def data():
 
 def test_http_app_streaming_with_data(data, repeat, vcs_app):
     app = vcs_app
-    for x in xrange(repeat / 10):
+    for x in range(repeat / 10):
         response = app.post('/stream/git/', params=data)
         assert response.status_code == 200
 
 
 def test_http_app_streaming_no_data(repeat, vcs_app):
     app = vcs_app
-    for x in xrange(repeat / 10):
+    for x in range(repeat / 10):
         response = app.post('/stream/git/')
         assert response.status_code == 200
diff --git a/vcsserver/tests/test_subprocessio.py b/vcsserver/tests/test_subprocessio.py
--- a/vcsserver/tests/test_subprocessio.py
+++ b/vcsserver/tests/test_subprocessio.py
@@ -32,7 +32,7 @@ class KindaFilelike(object):  # pragma: 
         self.stream = self._get_stream(data, chunks)
 
     def _get_stream(self, data, chunks):
-        for x in xrange(chunks):
+        for x in range(chunks):
             yield data
 
     def read(self, n):