diff --git a/.gitignore b/.gitignore
index 960183a79..4c336b710 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ build/
 
 localhost-800*/
 static/client/register/register_config.js
+.tox
diff --git a/MANIFEST.in b/MANIFEST.in
index a9b543af8..621e34cb7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,13 +3,20 @@ include LICENSE
 include VERSION
 include *.rst
 include demo/README
+include demo/demo.tls.dh
+include demo/*.py
+include demo/*.sh
 
 recursive-include synapse/storage/schema *.sql
 recursive-include synapse/storage/schema *.py
 
-recursive-include demo *.dh
-recursive-include demo *.py
-recursive-include demo *.sh
 recursive-include docs *
 recursive-include scripts *
+recursive-include scripts-dev *
 recursive-include tests *.py
+
+recursive-include static *.css
+recursive-include static *.html
+recursive-include static *.js
+
+prune demo/etc
diff --git a/setup.py b/setup.py
index 16ccc0f1b..8ad20df7c 100755
--- a/setup.py
+++ b/setup.py
@@ -47,11 +47,6 @@ setup(
     packages=find_packages(exclude=["tests", "tests.*"]),
     description="Reference Synapse Home Server",
     install_requires=dependencies['requirements'](include_conditional=True).keys(),
-    setup_requires=[
-        "Twisted>=15.1.0", # Here to override setuptools_trial's dependency on Twisted>=2.4.0
-        "setuptools_trial",
-        "mock"
-    ],
     dependency_links=dependencies["DEPENDENCY_LINKS"],
     include_package_data=True,
     zip_safe=False,
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..58cf9613c
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,27 @@
+[tox]
+envlist = packaging, py27, pep8
+
+[testenv]
+deps =
+    coverage
+    Twisted>=15.1
+    mock
+setenv =
+    PYTHONDONTWRITEBYTECODE = no_byte_code
+commands =
+    coverage run --source=./synapse {envbindir}/trial tests
+    coverage report -m
+install_command =
+    pip install --process-dependency-links --pre {opts} {packages}
+
+[testenv:packaging]
+deps =
+    check-manifest
+commands =
+    check-manifest
+
+[testenv:pep8]
+basepython = python2.7
+deps =
+    flake8
+commands = flake8 synapse