diff --git a/charmcraft.yaml b/charmcraft.yaml
index 295f42a..14fd402 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -23,7 +23,3 @@ bases:
           channel: "20.04"
           architectures:
               - amd64
-        - name: ubuntu
-          channel: "18.04"
-          architectures:
-              - amd64
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index 4a6e1d8..f0a09b0 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -1,4 +1,4 @@
 flake8
 mock
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
 python-openstackclient
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
deleted file mode 120000
index f81f6ff..0000000
--- a/src/tests/functional/tests/bundles/bionic.yaml
+++ /dev/null
@@ -1 +0,0 @@
-base.yaml
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
deleted file mode 100644
index 04930d7..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-series: bionic
\ No newline at end of file
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index e91735b..b814169 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -18,7 +18,6 @@ configure:
 gate_bundles:
   - jammy
   - focal
-  - bionic
 dev_bundles:
   - jammy
   - focal