diff --git a/acme/.pep8 b/acme/.pep8
new file mode 100644
index 000000000..22045d3d3
--- /dev/null
+++ b/acme/.pep8
@@ -0,0 +1,4 @@
+[pep8]
+# E265 block comment should start with '# '
+# E501 line too long (X > 79 characters)
+ignore = E265,E501
diff --git a/pep8.travis.sh b/pep8.travis.sh
index ccac0a435..91124bdbd 100755
--- a/pep8.travis.sh
+++ b/pep8.travis.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
+
+set -e  # Fail fast
+
+# PEP8 is not ignored in ACME
+pep8 --config=acme/.pep8 acme
+
 pep8 \
   setup.py \
-  acme \
   letsencrypt \
   letsencrypt-apache \
   letsencrypt-nginx \