diff --git a/.travis.yml b/.travis.yml
index 03b18cd1f..c6f5218ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,8 @@ language: python
 python:
     - "2.7"
 
+cache: pip
+
 before_install:
   - lsb_release -a
   - sudo add-apt-repository ppa:deluge-team/ppa -y
@@ -16,7 +18,7 @@ install:
 
 env:
   global:
-    - PIP_DOWNLOAD_CACHE=$HOME/.pip-cache/
+    - PIP_DOWNLOAD_CACHE=$HOME/.cache/pip
     - APTPACKAGES="python-libtorrent"
     - APTPACKAGES_GTKUI="python-gobject python-glade2"
     - DISPLAY=:99.0
diff --git a/tox.ini b/tox.ini
index d137d8ded..e5460fdf0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,7 @@ deps =
     pyxdg
     pytest
     mock
+    slimit
 whitelist_externals = py.test
 commands = {envpython} setup.py test
 
@@ -97,20 +98,18 @@ commands =
     python -c "import subprocess, sys; output = subprocess.check_output('isort -q --diff --recursive deluge docs packaging *.py', shell=True); print output; sys.exit(len(output) != 0)"
 
 [testenv:flake8]
-# Force flake8 pip install as system flake8 uses hardcoded python path which imports the wrong libraries.
-install_command = pip -v install --ignore-installed {opts} {packages}
-setenv = {[testenv]setenv}
+# Disble site packages to avoid using system flake8 which uses hardcoded python path which imports the wrong libraries.
+sitepackages = False
 deps =
     {[testenv]deps}
     flake8
     pep8-naming
-    slimit
 commands =
     flake8 --version
     flake8
 
 [testenv:flake8-complexity]
-setenv = {[testenv]setenv}
+sitepackages = False
 deps =
     {[testenv:flake8]deps}
     mccabe
@@ -118,14 +117,12 @@ commands = flake8 --exit-zero --max-complexity 15 deluge
 
 
 [testenv:pylint]
-# Force pylint pip install to avoid using system installed version
-install_command = pip -v install --ignore-installed {opts} {packages}
-setenv = {[testenv]setenv}
+# Disable site packages to avoid using system installed version
+sitepackages = False
 deps =
     {[testenv]deps}
     pylint
-whitelist_externals =
-    bash
+whitelist_externals = bash
 commands =
     pylint --version
     pylint deluge
@@ -176,7 +173,6 @@ commands =
 [docsbase]
 sitepackages = False
 changedir = docs
-install_command = pip install {opts} {packages}
 deps =
     {[testenv]deps}
     sphinx
@@ -185,20 +181,19 @@ deps =
 whitelist_externals =
     {[testenv]whitelist_externals}
     sphinx-build
-commands = sphinx-build -E -W -b html -d build/doctrees source build/html
 
 [testenv:docs]
 sitepackages = {[docsbase]sitepackages}
-changedir = {[docsbase]changedir}
-install_command = {[docsbase]install_command}
 deps = {[docsbase]deps}
-whitelist_externals = {[docsbase]whitelist_externals}
-commands = sphinx-build -v -E -T -b html -d build/doctrees source build/html
+whitelist_externals = echo
+commands =
+    echo "sphinx-apidoc --force -o docs/source/modules/ deluge deluge/plugins"
+    echo "sphinx-build -v -E -T -b html -d docs/build/doctrees docs/source docs/build/html"
+    python setup.py build_docs
 
 [testenv:docscoverage]
 sitepackages = {[docsbase]sitepackages}
 changedir = {[docsbase]changedir}
-install_command = {[docsbase]install_command}
 deps =
     {[docsbase]deps}
     coverage