diff --git a/.travis.yml b/.travis.yml
index fdc5650db22b1e..3d6789ea586163 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,18 @@ matrix:
   include:
     - python: "3.4.2"
       env: TOXENV=lint
+    - python: "3.4.2"
+      env: TOXENV=pylint
     - python: "3.4.2"
       env: TOXENV=py34
     # - python: "3.5"
     #   env: TOXENV=typing
-    - python: "3.5"
+    - python: "3.5.3"
       env: TOXENV=py35
     - python: "3.6"
       env: TOXENV=py36
     # - python: "3.6-dev"
     #   env: TOXENV=py36
-    - python: "3.4.2"
-      env: TOXENV=requirements
   # allow_failures:
   #   - python: "3.5"
   #     env: TOXENV=typing
@@ -29,5 +29,5 @@ cache:
     - $HOME/.cache/pip
 install: pip install -U tox coveralls
 language: python
-script: travis_wait tox
+script: travis_wait 30 tox --develop
 after_success: coveralls
diff --git a/script/setup b/script/setup
index f554efe9153589..554389e063e085 100755
--- a/script/setup
+++ b/script/setup
@@ -5,7 +5,6 @@
 set -e
 
 cd "$(dirname "$0")/.."
-git submodule init
 script/bootstrap
 
 pip3 install -e .
diff --git a/setup.cfg b/setup.cfg
index f6cc8bd45b9dcb..d6dfdfe0ea5645 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,10 +6,7 @@ testpaths = tests
 norecursedirs = .git testing_config
 
 [flake8]
-exclude = .venv,.git,.tox,docs,www_static,venv,bin,lib,deps,build
-
-[pydocstyle]
-match_dir = ^((?!\.|www_static).)*$
+exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build
 
 [isort]
 # https://github.com/timothycrosley/isort
diff --git a/tox.ini b/tox.ini
index e3063af8f400ff..f3e58ce88891aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,12 +12,12 @@ setenv =
 whitelist_externals = /usr/bin/env
 install_command = /usr/bin/env LANG=C.UTF-8 pip install {opts} {packages}
 commands =
-     py.test --timeout=30 --duration=10 --cov --cov-report= {posargs}
+     py.test --timeout=15 --duration=10 --cov --cov-report= {posargs}
 deps =
      -r{toxinidir}/requirements_test_all.txt
      -c{toxinidir}/homeassistant/package_constraints.txt
 
-[testenv:lint]
+[testenv:pylint]
 basepython = python3
 ignore_errors = True
 deps =
@@ -25,15 +25,16 @@ deps =
      -r{toxinidir}/requirements_test.txt
      -c{toxinidir}/homeassistant/package_constraints.txt
 commands =
-     flake8
      pylint homeassistant
-     pydocstyle homeassistant tests
 
-[testenv:requirements]
+[testenv:lint]
 basepython = python3
 deps =
+     -r{toxinidir}/requirements_test.txt
 commands =
          python script/gen_requirements_all.py validate
+         flake8
+         pydocstyle homeassistant tests
 
 [testenv:typing]
 basepython = python3