diff --git a/pylintrc b/pylintrc
new file mode 100644
index 00000000..4ec63b1d
--- /dev/null
+++ b/pylintrc
@@ -0,0 +1,31 @@
+# The format of this file isn't really documented; just use --generate-rcfile
+
+[Messages Control]
+# C0111: Don't require docstrings on every method
+# W0511: TODOs in code comments are fine.
+# W0142: *args and **kwargs are fine.
+# W0622: Redefining id is fine.
+disable=C0111,W0511,W0142,W0622
+
+[Basic]
+# Variable names can be 1 to 31 characters long, with lowercase and underscores
+variable-rgx=[a-z_][a-z0-9_]{0,30}$
+
+# Argument names can be 2 to 31 characters long, with lowercase and underscores
+argument-rgx=[a-z_][a-z0-9_]{1,30}$
+
+# Method names should be at least 3 characters long
+# and be lowercased with underscores
+method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
+
+[Design]
+max-public-methods=100
+min-public-methods=0
+max-args=6
+
+[Variables]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+# _ is used by our localization
+additional-builtins=_
diff --git a/test-requirements.txt b/test-requirements.txt
index 43ed09c0..367442e2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
 # Hacking already pins down pep8, pyflakes and flake8
 hacking>=0.9.2,<0.10
+pylint==0.25.2
 
 discover
 fixtures>=0.3.14
diff --git a/tox.ini b/tox.ini
index 67aee1c6..06e8ab6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,9 @@ usedevelop = True
 [testenv:pep8]
 commands = flake8
 
+[testenv:pylint]
+commands = pylint oslo
+
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
 commands =