diff --git a/.bzrignore b/.bzrignore
index a2c7a09..9ad1b67 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,2 +1,5 @@
 bin
 .coverage
+.testrepository
+.tox
+tags
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..801646b
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..426002d
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+PyYAML>=3.1.0
+simplejson>=2.2.0
+netifaces>=0.10.4
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..3af44d7
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
+charm-tools
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..a79b65d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,29 @@
+[tox]
+envlist = lint,py27
+skipsdist = True
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
+install_command =
+  pip install --allow-unverified python-apt {opts} {packages}
+commands = ostestr {posargs}
+
+[testenv:py27]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
+[testenv:lint]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = flake8 {posargs} hooks unit_tests tests actions
+           charm proof
+
+[testenv:venv]
+commands = {posargs}
+
+[flake8]
+ignore = E402,E226
+exclude = hooks/charmhelpers
diff --git a/unit_tests/test_heat_relations.py b/unit_tests/test_heat_relations.py
index dc63928..2b3a625 100644
--- a/unit_tests/test_heat_relations.py
+++ b/unit_tests/test_heat_relations.py
@@ -63,7 +63,7 @@ class HeatRelationTests(CharmTestCase):
                                              'uuid', 'heat-api',
                                              'heat-api-cfn',
                                              'heat-engine'], fatal=True)
-        self.execd_preinstall.assert_called()
+        self.assertTrue(self.execd_preinstall.called)
 
     @patch.object(relations, 'configure_https')
     def test_config_changed_no_upgrade(self, mock_configure_https):
@@ -145,7 +145,7 @@ class HeatRelationTests(CharmTestCase):
         configs.complete_contexts = MagicMock()
         configs.complete_contexts.return_value = []
         relations.amqp_changed()
-        self.log.assert_called()
+        self.assertTrue(self.log.called)
 
     @patch.object(relations, 'CONFIGS')
     def test_relation_broken(self, configs):