diff --git a/setup.py b/setup.py
index 738c983..bac901c 100644
--- a/setup.py
+++ b/setup.py
@@ -45,11 +45,18 @@ def run_tests(self):
                  'Programming Language :: Python :: 3.1',
                  'Programming Language :: Python :: 3.2',
                  'Programming Language :: Python :: 3.3',
+                 'Programming Language :: Python :: 3.4',
+                 'Programming Language :: Python :: 3.5',
+                 'Programming Language :: Python :: 3.6',
+                 'Programming Language :: Python :: 3.7',
+                 'Programming Language :: Python :: 3.8',
+                 'Programming Language :: Python :: 3.9',
+                 'Programming Language :: Python :: 3.10',
                  'Programming Language :: Python :: Implementation :: CPython',
                  'Programming Language :: Python :: Implementation :: Jython',
                  'Programming Language :: Python :: Implementation :: PyPy',
                  'Topic :: Games/Entertainment'],
-    install_requires=['distribute'],
+    install_requires=['distribute; python_version < "3.6.5"'],
     test_suite='glicko2tests',
     tests_require=['pytest'],
 )
diff --git a/tox.ini b/tox.ini
index 4e2de28..fc38ea0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py25, py26, py27, py31, py32, py33, pypy, jython
+envlist = py25, py26, py27, py31, py32, py33, py34, py35, py36, py37, py38, py39, py310, pypy, jython
 
 [testenv]
 commands = {envpython} setup.py test