diff --git a/pytest.ini b/pytest.ini
index c0f94d3ce..f7e5719c5 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -19,6 +19,7 @@ pep8ignore =
     E266  # too many leading '#' for block comment
     W503  # line break before binary operator
     resources.py ALL
+    .hypothesis/* ALL
 mccabe-complexity = 12
 qt_log_level_fail = WARNING
 qt_log_ignore =
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 953012acd..5d024d486 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -547,7 +547,7 @@ class Command(BaseType):
         if not value:
             return
         splitted = value.split()
-        if not splitted or  splitted[0] not in cmdutils.cmd_dict:
+        if not splitted or splitted[0] not in cmdutils.cmd_dict:
             raise configexc.ValidationError(value, "must be a valid command!")
 
     def complete(self):
diff --git a/tests/config/test_configtypes.py b/tests/config/test_configtypes.py
index 966c13083..5786ea2b0 100644
--- a/tests/config/test_configtypes.py
+++ b/tests/config/test_configtypes.py
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
+# pylint: disable=protected-access
+
 """Tests for qutebrowser.config.configtypes."""
 
 import re
diff --git a/tests/config/test_configtypes_hypothesis.py b/tests/config/test_configtypes_hypothesis.py
index e214e39e7..c5c02b16b 100644
--- a/tests/config/test_configtypes_hypothesis.py
+++ b/tests/config/test_configtypes_hypothesis.py
@@ -29,7 +29,7 @@ from qutebrowser.config import configtypes, configexc
 
 
 def gen_classes():
-    for name, member in inspect.getmembers(configtypes, inspect.isclass):
+    for _name, member in inspect.getmembers(configtypes, inspect.isclass):
         if member is configtypes.BaseType:
             pass
         elif member is configtypes.MappingType:
diff --git a/tox.ini b/tox.ini
index 8ebbf7600..2c3721b6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -82,6 +82,7 @@ deps =
     astroid==1.3.6
     beautifulsoup4==4.4.0
     pylint==1.4.4
+    hypothesis==1.8.4
     logilab-common==1.0.2
     six==1.9.0
 commands =