diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 2666f34..6e42738 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -32,6 +32,8 @@ jobs:
           PYTHON_VERSION: 3.7
         python38:
           PYTHON_VERSION: 3.8
+        python39:
+          PYTHON_VERSION: 3.9
 
     steps:
     - template: .azure-pipelines/ci.yml
@@ -47,6 +49,8 @@ jobs:
           PYTHON_VERSION: 3.7
         python38:
           PYTHON_VERSION: 3.8
+        python39:
+          PYTHON_VERSION: 3.9
 
     steps:
     - template: .azure-pipelines/ci.yml
@@ -62,6 +66,8 @@ jobs:
           PYTHON_VERSION: 3.7
         python38:
           PYTHON_VERSION: 3.8
+        python39:
+          PYTHON_VERSION: 3.9
 
     steps:
     - template: .azure-pipelines/ci.yml
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
index 0000000..332c367
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,12 @@
+[bumpversion]
+current_version = 2.2.0
+commit = True
+tag = True
+
+[bumpversion:file:setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"
+
+[bumpversion:file:procrunner/__init__.py]
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"
diff --git a/.travis.yml b/.travis.yml
index 523d7a0..6c875e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,6 @@ language: python
 
 matrix:
   include:
-    - python: 3.9-dev
-      dist: bionic
-#    - python: 3.9
-#      dist: bionic
-#      env: OPTIONAL=1
     - python: 3.8
     - python: 3.7
     - python: 3.6
diff --git a/HISTORY.rst b/HISTORY.rst
index 7b5accf..8df2df1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,7 +4,7 @@ History
 
 2.3.0 (????-??-??)
 ------------------
-* Python 3.6+ only, support for Python 3.5 has been dropped
+* Add Python 3.9 support, drop Python 3.5 support
 * Fix a file descriptor leak on subprocess execution
 
 2.2.0 (2020-09-07)
diff --git a/pytest.ini b/pytest.ini
index fe55d2e..f35fcaa 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,3 @@
 [pytest]
+addopts = -ra
 junit_family=xunit2
diff --git a/setup.cfg b/setup.cfg
index 1e57d71..e9b819e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,18 +1,8 @@
-[bumpversion]
-current_version = 2.2.0
-commit = True
-tag = True
-
-[bumpversion:file:setup.py]
-search = version="{current_version}"
-replace = version="{new_version}"
-
-[bumpversion:file:procrunner/__init__.py]
-search = __version__ = "{current_version}"
-replace = __version__ = "{new_version}"
-
-[bdist_wheel]
-universal = 1
+[metadata]
+project-urls =
+    Documentation = https://procrunner.readthedocs.io/
+    GitHub = https://github.com/DiamondLightSource/python-procrunner
+    Bug-Tracker = https://github.com/DiamondLightSource/python-procrunner/issues
 
 [flake8]
 exclude = docs
diff --git a/tox.ini b/tox.ini
index fc76a2d..3dcc731 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
-envlist = py36, py37, py38, py39, flake8
+envlist = py36, py37, py38, flake8
 
 [travis]
 python =
-    3.9: py39
     3.8: py38
     3.7: py37
     3.6: py36