diff --git a/.travis.yml b/.travis.yml
index a1b0a76972a7..fa81e929d7bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ python:
   - "3.4"
 install:
   - pip install -r requirements.txt
-  - pip install pep8
+  - pip install pep8 pylint
 script:
   - pep8 homeassistant --exclude bower_components,external
+  - pylint homeassistant
   - python -m homeassistant -t test
-
diff --git a/pylintrc b/pylintrc
index bdb117870524..28d50902f2a9 100644
--- a/pylintrc
+++ b/pylintrc
@@ -1,7 +1,12 @@
 [MASTER]
 ignore=external
+reports=no
 
-disable=locally-disabled,duplicate-code
+# Reasons disabled:
+# locally-disabled - it spams too much
+# duplicate-code - unavoidable
+# cyclic-import - doesn't test if both import on load
+disable=locally-disabled,duplicate-code,cyclic-import
 
 [EXCEPTIONS]
 overgeneral-exceptions=Exception,HomeAssistantError