diff --git a/setup.cfg b/setup.cfg
index 8050dd345..d11c57507 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,7 @@ logging-clear-handlers=1
 
 [flake8]
 min-version=2.7
+accept-encodings=utf-8
 # Default pyflakes errors we ignore:
 # - E241: missing whitespace after ',' (used to align visually)
 # - E221: multiple spaces before operator (used to align visually)
diff --git a/tox.ini b/tox.ini
index 598368daa..648054b89 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,7 @@ deps =
 [_flake8]
 deps =
     flake8
+    flake8-coding
     flake8-future-import
     pep8-naming
 files = beets beetsplug beet test setup.py docs