diff --git a/doc/source/conf.py b/doc/source/conf.py
index 82fa87b..18a1d0d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -39,12 +39,6 @@ pygments_style = 'sphinx'
 
 # -- Options for HTML output --------------------------------------------------
 
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme_path = ["."]
-html_theme = '_theme'
-html_static_path = ['static']
-
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
 
diff --git a/tox.ini b/tox.ini
index 45750db..b7a80b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,pep8
 
 [testenv]
+usedevelop = True
+install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          LANG=en_US.UTF-8
          LANGUAGE=en_US:en
@@ -11,7 +15,6 @@ commands =
   python setup.py testr --testr-args='{posargs}'
 
 [tox:jenkins]
-sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]