diff --git a/.travis.yml b/.travis.yml
index 7716fe16..a591304d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
 language: python
 python:
-  - 3.6
   - 3.7
   - 3.8
-  - 3.9-dev
 
 env:
   - TOXENV=coverage
 
 stages:
-  - lint
   - test
   - name: deploy
     if: repo = boxed/mutmut AND tag IS present
@@ -23,13 +20,8 @@ after_success:
   - codecov
 
 jobs:
-  allow_failures:
-    - python: 3.9-dev
-    - env: TOXENV=lint
-
   include:
     - stage: test
-      env: TOXENV=lint
       python: 3.8
       after_success: skip
 
diff --git a/HISTORY.rst b/HISTORY.rst
index a7b78f61..8904fcee 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,19 @@
 Changelog
 ---------
 
+2.1.0
+~~~~~
+
+* Support unittest, so you don't need pytest anymore
+
+* Fixed a bug where Ctrl+C wouldn't exit mutmut
+
+* Support for Coverage 5
+
+* Skip mutating test files if they are in the same source tree as the main code
+
+* Advanced whitelisting: More advanced AST level callback
+
 2.0.0
 ~~~~~
 
diff --git a/README.rst b/README.rst
index 2b534b8b..af3732cc 100644
--- a/README.rst
+++ b/README.rst
@@ -43,7 +43,8 @@ You can get started with a simple:
     pip install mutmut
     mutmut run
 
-This will by default run pytest on tests in the "tests" or "test" folder and
+This will by default run pytest (or unittest if pytest is unavailable)
+on tests in the "tests" or "test" folder and
 it will try to figure out where the code to mutate lies. Run
 
 .. code-block:: console
diff --git a/mutmut/__init__.py b/mutmut/__init__.py
index d89f4697..df57da67 100644
--- a/mutmut/__init__.py
+++ b/mutmut/__init__.py
@@ -32,7 +32,7 @@
 from parso import parse
 from parso.python.tree import Name, Number, Keyword
 
-__version__ = '2.0.0'
+__version__ = '2.1.0'
 
 
 try:
diff --git a/tests/test_main.py b/tests/test_main.py
index 9b46ae7c..459279db 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -16,7 +16,6 @@
 
 import pytest
 from click.testing import CliRunner
-from coverage import CoverageData
 
 from mutmut import (
     compute_exit_code,
diff --git a/tox.ini b/tox.ini
index 4d876c43..58f44732 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3{6,7,8,9}
+envlist = py3{7,8,9}
 skip_missing_interpreters = True
 
 [testenv]