diff --git a/.travis.yml b/.travis.yml
index 2b74949d..add5a0ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,10 @@ matrix:
       env: TOXENV=py37
     - python: "3.8"
       env: TOXENV=py38
-    - python: "3.9-dev"
+    - python: "3.9"
       env: TOXENV=py39
+    - python: "3.9-dev"
+      env: TOXENV=py39-dev
     - python: "pypy2.7-6.0"
       env: TOXENV=pypy
     - python: "pypy3.5-7.0"
@@ -28,7 +30,9 @@ matrix:
 
 install:
   - pip install babel
-  - pip install .
+  # upgrade tox, pip, and virtualenv so Python 3.6 will build crytography:
+  # https://travis-ci.community/t/pip-install-cryptography-fails-on-py36/11233
+  - pip install -U tox pip virtualenv
   - pip install codecov
   - pip install -r dev-requirements.txt
   - pip install -r requirements.txt
diff --git a/setup.py b/setup.py
index 7bd396b1..11b838f6 100755
--- a/setup.py
+++ b/setup.py
@@ -106,6 +106,5 @@ setup(
     ),
     entry_points={'console_scripts': console_scripts},
     python_requires='>=2.7',
-    setup_requires=['pytest-runner', 'babel', ],
-    tests_require=open('dev-requirements.txt').readlines(),
+    setup_requires=['babel', ],
 )
diff --git a/tox.ini b/tox.ini
index b8e564ec..ce427e61 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,py38,py39,pypy,pypy3,coverage-report
+envlist = py27,py35,py36,py37,py38,py39,py39-dev,pypy,pypy3,coverage-report
 
 
 [testenv]
@@ -75,6 +75,16 @@ commands =
     coverage run --parallel -m pytest {posargs}
     flake8 . --count --show-source --statistics
 
+[testenv:py39-dev]
+deps=
+   dbus-python
+   -r{toxinidir}/requirements.txt
+   -r{toxinidir}/dev-requirements.txt
+commands =
+    python setup.py compile_catalog
+    coverage run --parallel -m pytest {posargs}
+    flake8 . --count --show-source --statistics
+
 [testenv:pypy]
 deps=
    -r{toxinidir}/requirements.txt