diff --git a/.pep8speaks.yml b/.pep8speaks.yml
new file mode 100644
index 00000000000..cd610907007
--- /dev/null
+++ b/.pep8speaks.yml
@@ -0,0 +1,11 @@
+# File : .pep8speaks.yml
+
+scanner:
+    diff_only: True  # If True, errors caused by only the patch are shown
+
+pycodestyle:
+    max-line-length: 79
+    ignore:  # Errors and warnings to ignore
+        - E402,  # module level import not at top of file
+        - E731,  # do not assign a lambda expression, use a def
+        - W503   # line break before binary operator
diff --git a/.stickler.yml b/.stickler.yml
deleted file mode 100644
index 79d8b7fb717..00000000000
--- a/.stickler.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-linters:
-  flake8:
-    max-line-length: 79
-    fixer: false
-    ignore: I002
-    # stickler doesn't support 'exclude' for flake8 properly, so we disable it
-    # below with files.ignore:
-    # https://github.com/markstory/lint-review/issues/184
-files:
-  ignore:
-    - doc/**/*.py