diff --git a/.travis.yml b/.travis.yml
index 0ed2abc3..3111d958 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,6 @@ matrix:
     - python: 3.6
       env:
         - TOX_ENV=py36
-    - python: 3.6
-      env:
-        - TOX_ENV=pypy3.6
     - python: 3.6
       env:
         - TOX_ENV=py36-numpy
@@ -37,12 +34,12 @@ matrix:
     - python: 3.6
       env:
         - TOX_ENV=docs-py3
-    - python: 3.7
+    - python: 3.8
       env:
-        - TOX_ENV=check-format
+        - TOX_ENV=lint
     - python: 3.8
       env:
-        - TOX_ENV=mypy
+        - TOX_ENV=typing
 
 before_install:
   - export EASY_SETUP_URL='http://peak.telecommunity.com/dist/ez_setup.py'
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 7d320b96..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[egg_info]
-;tag_build = .dev
-;tag_svn_revision = true
diff --git a/setup.py b/setup.py
index 4c347ec0..8e16e646 100755
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,10 @@ def read(fname):
 
 assert __version__ is not None
 
+TESTS_BASIC = ["pytest>=5.0", "pytest-sugar", "coverage"]
+TESTS_NUMPY = ["numpy"]
+
+
 params = dict(
     name="PyHamcrest",
     version=__version__,  # flake8:noqa
@@ -52,7 +56,8 @@ def read(fname):
     install_requires=[],
     extras_require={
         "docs": ["sphinx~=3.0", "sphinx_rtd_theme~=0.4"],
-        "tests": ["pytest>=5.0", "pytest-sugar", "coverage"],
+        "tests": TESTS_BASIC,
+        "tests-numpy": TESTS_BASIC + TESTS_NUMPY,
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/tox.ini b/tox.ini
index 7ce8d7fe..d3ce223b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,7 @@ filterwarnings =
 # Keep docs in sync with docs env and .readthedocs.yml.
 [gh-actions]
 python =
-    2.7: py27
-    3.5: py35
-    3.6: py36
+    3.6: py36, py36-numpy
     3.7: py37, docs
     3.8: py38, lint, manifest, typing, changelog
     3.9: py39
@@ -38,6 +36,9 @@ commands = python -m pytest {posargs}
 extras = {env:TOX_AP_TEST_EXTRAS:tests}
 commands = coverage run -m pytest {posargs}
 
+[testenv:py36-numpy]
+extras = tests-numpy
+commands = python -m pytest {posargs}
 
 [testenv:py37]
 # Python 3.6+ has a number of compile-time warnings on invalid string escapes.