diff --git a/diskimage_builder/tests/test_elementdeps.py b/diskimage_builder/tests/test_elementdeps.py
index 0c263acf0..465301f95 100644
--- a/diskimage_builder/tests/test_elementdeps.py
+++ b/diskimage_builder/tests/test_elementdeps.py
@@ -27,15 +27,17 @@ data_dir = os.path.abspath(
 
 
 def _populate_element(element_dir, element_name, element_deps=[], provides=[]):
-        logger.debug("Populate %s <%s>" % (element_name, element_dir))
-        element_home = os.path.join(element_dir, element_name)
-        os.mkdir(element_home)
-        deps_path = os.path.join(element_home, 'element-deps')
-        with open(deps_path, 'w') as deps_file:
-            deps_file.write("\n".join(element_deps))
+    logger.debug("Populate %s <%s>" % (element_name, element_dir))
+    element_home = os.path.join(element_dir, element_name)
+    os.mkdir(element_home)
+    deps_path = os.path.join(element_home, 'element-deps')
+
+    with open(deps_path, 'w') as deps_file:
+        deps_file.write("\n".join(element_deps))
         provides_path = os.path.join(element_home, 'element-provides')
-        with open(provides_path, 'w') as provides_file:
-            provides_file.write("\n".join(provides))
+
+    with open(provides_path, 'w') as provides_file:
+        provides_file.write("\n".join(provides))
 
 
 class TestElementDeps(testtools.TestCase):
@@ -94,11 +96,11 @@ class TestElementDeps(testtools.TestCase):
 
     # helper to return an (element, path) tuple from the standard dir
     def _e(self, element):
-            return (element, os.path.join(self.element_dir, element))
+        return (element, os.path.join(self.element_dir, element))
 
     # helper to return an (element, path) tuple from the override dir
     def _eo(self, element):
-            return (element, os.path.join(self.element_override_dir, element))
+        return (element, os.path.join(self.element_override_dir, element))
 
     def test_non_transitive_deps(self):
         result = element_dependencies.get_elements(['requires-foo'],
diff --git a/pylint.cfg b/pylint.cfg
new file mode 100644
index 000000000..14722ec65
--- /dev/null
+++ b/pylint.cfg
@@ -0,0 +1,7 @@
+[MASTER]
+persistent=no
+
+[MESSAGES CONTROL]
+
+disable=all
+enable=bad-indentation
\ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
index 09d4c6154..eac8b1c63 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,6 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
+pylint==1.4.5 # GPLv2
 
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 8e989b482..9ba451e19 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,11 @@ commands =
   flake8 {posargs}
   dib-lint
 
+[testenv:pylint]
+setenv = VIRTUAL_ENV={envdir}
+deps = pylint
+commands = pylint --rcfile pylint.cfg diskimage_builder
+
 [testenv:venv]
 commands = {posargs}