diff --git a/.gitignore b/.gitignore
index 172bf57..9dd3eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .tox
+.testrepository
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..736a626
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/charm-interface-keystone
diff --git a/interface.yaml b/interface.yaml
index 0fe7e66..f01f858 100644
--- a/interface.yaml
+++ b/interface.yaml
@@ -1,3 +1,3 @@
 name: keystone
 summary: Interface for integrating with Keystone identity service
-maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
+maintainer: OpenStack Charmers <openstack-dev@lists.openstack.org>
diff --git a/test-requirements.txt b/test-requirements.txt
index 10dbed3..095ec9c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,2 @@
 flake8>=2.2.4,<=2.4.1
 os-testr>=0.4.1
-charm-tools
diff --git a/tox.ini b/tox.ini
index c035f1a..c395138 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
-envlist = lint,py27
+envlist = pep8,py27,py34,py35
 skipsdist = True
+skip_missing_interpreters = True
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -12,8 +13,22 @@ commands = ostestr {posargs}
 [testenv:py27]
 basepython = python2.7
 deps = -r{toxinidir}/test-requirements.txt
+# TODO: Need to write unit tests then remove the following command.
+commands = /bin/true
 
-[testenv:lint]
+[testenv:py34]
+basepython = python3.4
+deps = -r{toxinidir}/test-requirements.txt
+# TODO: Need to write unit tests then remove the following command.
+commands = /bin/true
+
+[testenv:py35]
+basepython = python3.5
+deps = -r{toxinidir}/test-requirements.txt
+# TODO: Need to write unit tests then remove the following command.
+commands = /bin/true
+
+[testenv:pep8]
 basepython = python2.7
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs}