diff --git a/run.py b/run.py
index d860318..8937dd4 100644
--- a/run.py
+++ b/run.py
@@ -143,7 +143,7 @@ def get_elapsed():
             return PackageResult(name, version, 0, 'SKIPPED', 'Skipped', description,
                                  get_elapsed())
 
-    client = ServerProxy('https://pypi.python.org/pypi')
+    client = ServerProxy('https://pypi.org/pypi')
     basename = download_package(client, name, version)
     if basename is None:
         status_code, output = 1, 'No sdist found'
diff --git a/templates/index.html b/templates/index.html
index 7e3ecbb..599e31e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,7 +8,7 @@ <h1>pytest Plugins Compatibility</h1>
     <p>This page shows results of compatibility tests between <a href="https://pytest.org">pytest</a> plugins
        against different versions of the python interpreter.
     </p>
-    <p>The plugins are listed and tested automatically from <a href="https://pypi.python.org/pypi">pypi</a>.
+    <p>The plugins are listed and tested automatically from <a href="https://pypi.org/">PyPI</a>.
         For more information, please see <a href="https://github.com/pytest-dev/plugincompat">
             https://github.com/pytest-dev/plugincompat</a>.
     </p>
@@ -20,9 +20,9 @@ <h1>pytest Plugins Compatibility</h1>
         <strong>Note:</strong> although some may appear as "broken" keep in mind
         that all dependencies may not be installed during testing, particularly
         if a dependency is too big or requires a dedicated server (such
-        as <a href="https://pypi.python.org/pypi/pytest-jira">pytest-jira</a>,
+        as <a href="https://pypi.org/project/pytest-jira">pytest-jira</a>,
         which requires a jira server, or
-        <a href="https://pypi.python.org/pypi/pytest-qt">pytest-qt</a>,
+        <a href="https://pypi.org/project/pytest-qt">pytest-qt</a>,
         which requires PyQt or PySide, both which take a long time to install).
         Take the information you find here with a grain of salt, and rely on
         each plugin's homepage for up-to-date compatibility information.
@@ -42,7 +42,7 @@ <h1>pytest Plugins Compatibility</h1>
         <tbody>
             {% for lib_name in lib_names %}
             <tr>
-                <td><a href="https://pypi.python.org/pypi/{{ lib_name.rsplit('-', 1)[0] }}">{{ lib_name }}</a></td>
+                <td><a href="https://pypi.org/project/{{ lib_name.rsplit('-', 1)[0] }}">{{ lib_name }}</a></td>
                 <td>{{ descriptions[lib_name]}}</td>
                 {% for python_ver in python_versions %}
                     <td>
@@ -66,7 +66,7 @@ <h1>pytest Plugins Compatibility</h1>
     {% for lib_name in lib_names %}
         <a id="{{lib_name}}"/>
         <table class="striped rounded metro">
-            <caption><a href="https://pypi.python.org/pypi/{{ lib_name.rsplit('-', 1)[0] }}">{{ lib_name }}</a></caption>
+            <caption><a href="https://pypi.org/project/{{ lib_name.rsplit('-', 1)[0] }}">{{ lib_name }}</a></caption>
             <thead>
                 <tr>
                     <th>pytest</th>
diff --git a/templates/status_help.html b/templates/status_help.html
index 0448c25..a142210 100644
--- a/templates/status_help.html
+++ b/templates/status_help.html
@@ -18,7 +18,7 @@ <h3>/status/:name/</h3>
     </li>
 </ul>
 
-<p>For example, to query the status of plugin <a href="https://pypi.python.org/pypi/{{ name }}">{{ name }}</a> for
+<p>For example, to query the status of plugin <a href="https://pypi.org/project/{{ name }}">{{ name }}</a> for
         python 3.3 and pytest version 2.4.2, hit this url:</p>
 
 <code>/status/{{ name }}?py=py33&pytest=2.4.2</code>
diff --git a/update_index.py b/update_index.py
index 91d6f67..4658d9d 100644
--- a/update_index.py
+++ b/update_index.py
@@ -22,7 +22,7 @@
 import sys
 from distutils.version import LooseVersion
 
-if sys.version_info[0] == 3:
+if sys.version_info >= (3,):
     from xmlrpc.client import ServerProxy
 else:
     from xmlrpclib import ServerProxy
@@ -31,12 +31,12 @@
 
 
 def iter_plugins(client):
-    '''
+    """
     Returns an iterator of (name, latest version, summary) from PyPI.
 
     :param client: xmlrpclib.ServerProxy
     :param search: package names to search for
-    '''
+    """
     # previously we used the more efficient "search" XMLRPC method, but
     # that stopped returning all results after a while
     package_names = [x for x in client.list_packages()
@@ -82,7 +82,7 @@ def write_plugins_index(file_name, plugins):
     contents = json.dumps(plugin_contents, indent=2, separators=(',', ': '),
                           sort_keys=True)
     if os.path.isfile(file_name):
-        if sys.version_info[0] < (3,):
+        if sys.version_info < (3,):
             mode = 'rU'
         else:
             # universal newlines is enabled by default, and specifying it
@@ -102,7 +102,7 @@ def write_plugins_index(file_name, plugins):
 
 
 def main():
-    client = ServerProxy('https://pypi.python.org/pypi')
+    client = ServerProxy('https://pypi.org/pypi')
     plugins = sorted(iter_plugins(client))
 
     if write_plugins_index(INDEX_FILE_NAME, plugins):