diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..91e49d5
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.opendev.org
+port=29418
+project=openstack/charm-masakari-monitors.git
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..dc27661
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - python35-charm-jobs
+      - openstack-cover-jobs
diff --git a/requirements.txt b/requirements.txt
index cb6c9d4..20f335d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,7 @@
-# Requirements to build the charm
-charm-tools
+# This file is managed centrally.  If you find the need to modify this as a
+# one-off, please don't.  Intead, consult #openstack-charms and ask about
+# requirements management in charms via bot-control.  Thank you.
+#
+# Build requirements
+charm-tools>=2.4.4
 simplejson
-flake8
\ No newline at end of file
diff --git a/src/lib/charm/openstack/masakari_monitors.py b/src/lib/charm/openstack/masakari_monitors.py
index 4c64eed..fcda33e 100644
--- a/src/lib/charm/openstack/masakari_monitors.py
+++ b/src/lib/charm/openstack/masakari_monitors.py
@@ -59,6 +59,6 @@ class MasakariMonitorsCharm(charms_openstack.charm.OpenStackCharm):
             project='services')
 
     def install(self):
-        #charmhelpers.fetch.add_source('ppa:corey.bryant/bionic-stein')
+        # TODO: Stop using the PPA; https://bugs.launchpad.net/bugs/1838578
         charmhelpers.fetch.add_source('ppa:gnuoy/bionic-stein')
         super(MasakariMonitorsCharm, self).install()
diff --git a/test-requirements.txt b/test-requirements.txt
index 16bcf0b..14b380e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,13 @@
-# Unit test requirements
+# This file is managed centrally.  If you find the need to modify this as a
+# one-off, please don't.  Intead, consult #openstack-charms and ask about
+# requirements management in charms via bot-control.  Thank you.
+#
+# Lint and unit test requirements
 flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
+stestr>=2.2.0
+requests>=2.18.4
 charms.reactive
 mock>=1.2
+nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack#egg=charms.openstack
\ No newline at end of file
+git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack