diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 00000000..7051aeeb
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,3 @@
+- project:
+    templates:
+      - python35-charm-jobs
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 34fea2b0..414b34ce 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,8 +10,8 @@ description: |
   for Neutron LBaaS version 2.
   .
   Octavia accomplishes its delivery of load balancing services by managing a
-  fleet of virtual machines, containers, or bare metal servers—collectively
-  known as amphorae— which it spins up on demand. This on-demand, horizontal
+  fleet of virtual machines, containers, or bare metal servers collectively
+  known as amphorae which it spins up on demand. This on-demand, horizontal
   scaling feature differentiates Octavia from other load balancing solutions,
   thereby making Octavia truly suited "for the cloud."
 tags:
diff --git a/src/tests/bundles/overlays/smoke-bionic-rocky-ha.yaml.j2 b/src/tests/bundles/overlays/smoke-bionic-rocky-ha.yaml.j2
new file mode 100644
index 00000000..f8111570
--- /dev/null
+++ b/src/tests/bundles/overlays/smoke-bionic-rocky-ha.yaml.j2
@@ -0,0 +1,4 @@
+applications:
+  octavia:
+    options:
+        vip: '{{ OS_VIP00 }}'
diff --git a/src/tests/bundles/smoke-bionic-rocky-ha.yaml b/src/tests/bundles/smoke-bionic-rocky-ha.yaml
index bf174f2e..206e523c 100644
--- a/src/tests/bundles/smoke-bionic-rocky-ha.yaml
+++ b/src/tests/bundles/smoke-bionic-rocky-ha.yaml
@@ -23,6 +23,7 @@ applications:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
   octavia:
+    series: bionic
     charm: octavia
     num_units: 3
     options:
diff --git a/src/tests/bundles/smoke-bionic-rocky.yaml b/src/tests/bundles/smoke-bionic-rocky.yaml
index 4a36a4e3..f2401eb5 100644
--- a/src/tests/bundles/smoke-bionic-rocky.yaml
+++ b/src/tests/bundles/smoke-bionic-rocky.yaml
@@ -18,6 +18,7 @@ applications:
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
   octavia:
+    series: bionic
     charm: octavia
     num_units: 1
     options:
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index dbf59d7b..e5a4b9ff 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,5 +1,10 @@
 charm_name: octavia
+gate_bundles:
+- smoke-bionic-rocky
+- smoke-bionic-rocky-ha
 smoke_bundles:
 - smoke-bionic-rocky
 configure:
+- zaza.charm_tests.noop.setup.basic_setup
 tests:
+- zaza.charm_tests.noop.tests.NoopTest
diff --git a/tox.ini b/tox.ini
index 39938004..d3ce3359 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,11 @@ basepython = python3
 commands =
     charm-build --log-level DEBUG -o {toxinidir}/build src {posargs}
 
+[testenv:py35]
+basepython = python3.5
+deps = -r{toxinidir}/test-requirements.txt
+commands = ostestr {posargs}
+
 [testenv:py3]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt