diff --git a/.travis.yml b/.travis.yml
index 17e45a67..37fa499d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 language: python
 
 python:
@@ -8,10 +8,10 @@ python:
 cache: pip
 
 install:
-- pip install tox tox-venv
+- pip install tox
 
 before_script:
-  # Disable IPv6. Ref travis-ci/travis-ci#8361
+  # Enable IPv6. Ref travis-ci/travis-ci#8361
   - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
       sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
     fi
diff --git a/appveyor.yml b/appveyor.yml
index 6a1c99a9..c6f46e4f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ cache:
   - '%LOCALAPPDATA%\pip\Cache'
 
 test_script:
-  - "python -m pip install -U tox tox-venv virtualenv"
+  - "python -m pip install -U tox virtualenv"
   - "tox"
 
 version: '{build}'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0253a770..ee772682 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,10 +11,12 @@ trigger:
     - '*'
 
 pool:
-  vmimage: 'Ubuntu-18.04'
+  vmImage: $(pool_vm_image)
 
 variables:
 - group: Azure secrets
+- name: pool_vm_image
+  value: Ubuntu-18.04
 
 stages:
 - stage: Test
@@ -23,10 +25,17 @@ stages:
   - job: 'Test'
     strategy:
       matrix:
-        Python36:
+        Bionic Python 3.6:
           python.version: '3.6'
-        Python38:
+        Bionic Python 3.8:
           python.version: '3.8'
+        Windows:
+          python.version: '3.8'
+          pool_vm_image: vs2017-win2016
+        MacOS:
+          python.version: '3.8'
+          pool_vm_image: macos-10.15
+
       maxParallel: 4
 
     steps:
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 00000000..976ba029
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,2 @@
+[mypy]
+ignore_missing_imports = True
diff --git a/pytest.ini b/pytest.ini
index 7b9b714f..381b3271 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,9 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules --flake8 --black --cov
+addopts=--doctest-modules --flake8 --black --cov --mypy
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
+# workaround for warning pytest-dev/pytest#6178
+junit_family=xunit2
 filterwarnings=
+    # https://github.com/pytest-dev/pytest/issues/6928
+    ignore:direct construction of .*Item has been deprecated:DeprecationWarning
diff --git a/setup.cfg b/setup.cfg
index 41a05abe..f6aa05d5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,8 +31,9 @@ testing =
 	pytest >= 3.5, !=3.7.3
 	pytest-checkdocs >= 1.2.3
 	pytest-flake8
-	pytest-black-multipy
+	pytest-black >= 0.3.7
 	pytest-cov
+	pytest-mypy
 
 	# local
 	appdirs
diff --git a/skeleton.md b/skeleton.md
index 340b65cf..4544158f 100644
--- a/skeleton.md
+++ b/skeleton.md
@@ -120,7 +120,7 @@ Features include:
 
 Features include:
 - test against Python 3
-- run on Ubuntu Xenial
+- run on Ubuntu Bionic
 - correct for broken IPv6
 
 ### AppVeyor
diff --git a/tox.ini b/tox.ini
index 932d5718..171ef1ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,15 +3,10 @@ envlist = python
 minversion = 3.2
 # https://github.com/jaraco/skeleton/issues/6
 tox_pip_extensions_ext_venv_update = true
-# Ensure that a late version of pip is used even on tox-venv.
-requires =
-	tox-pip-version>=0.0.6
-	tox-venv
 
 
 [testenv]
 deps =
-pip_version = pip
 commands =
 	pytest {posargs}
 usedevelop = True