diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a86bbc6..473fdaf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,6 @@
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: autopep8-wrapper
-        args: ['-i', '--ignore=E265,E309,E501']
     -   id: check-docstring-first
     -   id: check-json
     -   id: check-added-large-files
@@ -14,11 +13,11 @@
     -   id: requirements-txt-fixer
     -   id: flake8
 -   repo: git@github.com:pre-commit/pre-commit
-    sha: 645838cb514583249478e347aa80a0af743edace
+    sha: 8dba3281d5051060755459dcf88e28fc26c27526
     hooks:
     -   id: validate_config
     -   id: validate_manifest
 -   repo: git@github.com:asottile/reorder_python_imports
-    sha: ea9fa14a757bb210d849de5af8f8ba2c9744027a
+    sha: 3d86483455ab5bd06cc1069fdd5ac57be5463f10
     hooks:
     -   id: reorder-python-imports
diff --git a/tests/trailing_whitespace_fixer_test.py b/tests/trailing_whitespace_fixer_test.py
index 4d56762..4b5b9a1 100644
--- a/tests/trailing_whitespace_fixer_test.py
+++ b/tests/trailing_whitespace_fixer_test.py
@@ -29,14 +29,12 @@
 
 
 # filename, expected input, expected output
-# pylint: disable=bad-whitespace
 MD_TESTS_1 = (
-    ('foo.md',        'foo  \nbar \n  ',         'foo  \nbar\n\n'),
-    ('bar.Markdown',  'bar   \nbaz\t\n\t\n',     'bar  \nbaz\n\n'),
-    ('.md',           'baz   \nquux  \t\n\t\n',  'baz\nquux\n\n'),
-    ('txt',           'foo   \nbaz \n\t\n',      'foo\nbaz\n\n'),
+    ('foo.md', 'foo  \nbar \n  ', 'foo  \nbar\n\n'),
+    ('bar.Markdown', 'bar   \nbaz\t\n\t\n', 'bar  \nbaz\n\n'),
+    ('.md', 'baz   \nquux  \t\n\t\n', 'baz\nquux\n\n'),
+    ('txt', 'foo   \nbaz \n\t\n', 'foo\nbaz\n\n'),
 )
-# pylint: enable=bad-whitespace
 
 
 @pytest.mark.parametrize(('filename', 'input_s', 'output'), MD_TESTS_1)
@@ -51,15 +49,13 @@
 
 
 # filename, expected input, expected output
-# pylint: disable=bad-whitespace
 MD_TESTS_2 = (
-    ('foo.txt',       'foo  \nbar \n  \n',       'foo  \nbar\n\n'),
-    ('bar.Markdown',  'bar   \nbaz\t\n\t\n',     'bar  \nbaz\n\n'),
-    ('bar.MD',        'bar   \nbaz\t   \n\t\n',  'bar  \nbaz\n\n'),
-    ('.txt',          'baz   \nquux  \t\n\t\n',  'baz\nquux\n\n'),
-    ('txt',           'foo   \nbaz \n\t\n',      'foo\nbaz\n\n'),
+    ('foo.txt', 'foo  \nbar \n  \n', 'foo  \nbar\n\n'),
+    ('bar.Markdown', 'bar   \nbaz\t\n\t\n', 'bar  \nbaz\n\n'),
+    ('bar.MD', 'bar   \nbaz\t   \n\t\n', 'bar  \nbaz\n\n'),
+    ('.txt', 'baz   \nquux  \t\n\t\n', 'baz\nquux\n\n'),
+    ('txt', 'foo   \nbaz \n\t\n', 'foo\nbaz\n\n'),
 )
-# pylint: enable=bad-whitespace
 
 
 @pytest.mark.parametrize(('filename', 'input_s', 'output'), MD_TESTS_2)
@@ -75,12 +71,10 @@
 
 
 # filename, expected input, expected output
-# pylint: disable=bad-whitespace
 MD_TESTS_3 = (
-    ('foo.baz',       'foo  \nbar \n  ',         'foo  \nbar\n\n'),
-    ('bar',           'bar   \nbaz\t\n\t\n',     'bar  \nbaz\n\n'),
+    ('foo.baz', 'foo  \nbar \n  ', 'foo  \nbar\n\n'),
+    ('bar', 'bar   \nbaz\t\n\t\n', 'bar  \nbaz\n\n'),
 )
-# pylint: enable=bad-whitespace
 
 
 @pytest.mark.parametrize(('filename', 'input_s', 'output'), MD_TESTS_3)
@@ -107,12 +101,10 @@
 
 
 # filename, expected input, expected output
-# pylint: disable=bad-whitespace
 MD_TESTS_4 = (
-    ('bar.md',        'bar   \nbaz\t   \n\t\n',  'bar\nbaz\n\n'),
-    ('bar.markdown',  'baz   \nquux  \n',        'baz\nquux\n'),
+    ('bar.md', 'bar   \nbaz\t   \n\t\n', 'bar\nbaz\n\n'),
+    ('bar.markdown', 'baz   \nquux  \n', 'baz\nquux\n'),
 )
-# pylint: enable=bad-whitespace
 
 
 @pytest.mark.parametrize(('filename', 'input_s', 'output'), MD_TESTS_4)
diff --git a/tox.ini b/tox.ini
index 2fa9214..eb0a1f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,3 +27,6 @@
 
 [flake8]
 max-line-length=131
+
+[pep8]
+ignore=E265,E309,E501