diff --git a/metadata.yaml b/metadata.yaml
index dfc77b8..5a4001f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -8,7 +8,6 @@ description: |
 tags:
 - databases
 series:
-- xenial
 - bionic
 extra-bindings:
   access:
diff --git a/osci.yaml b/osci.yaml
index b59687f..87c9579 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -4,7 +4,6 @@
     check:
       jobs:
       - bionic_model-bionic-ha
-      - xenial_model-xenial-ha
 
 - job:
     name: bionic_model-bionic-ha
@@ -17,10 +16,3 @@
       - tox-py38
     vars:
       tox_extra_args: bionic_model:bionic-ha
-- job:
-    name: xenial_model-xenial-ha
-    parent: func-target
-    dependencies:
-      - bionic_model-bionic-ha
-    vars:
-      tox_extra_args: xenial_model:xenial-ha
\ No newline at end of file
diff --git a/tests/bundles/overlays/xenial-ha.yaml.j2 b/tests/bundles/overlays/xenial-ha.yaml.j2
deleted file mode 120000
index 8ba59d0..0000000
--- a/tests/bundles/overlays/xenial-ha.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ha.yaml
\ No newline at end of file
diff --git a/tests/bundles/xenial-ha.yaml b/tests/bundles/xenial-ha.yaml
deleted file mode 120000
index 7f07a7e..0000000
--- a/tests/bundles/xenial-ha.yaml
+++ /dev/null
@@ -1 +0,0 @@
-xenial.yaml
\ No newline at end of file
diff --git a/tests/bundles/xenial.yaml b/tests/bundles/xenial.yaml
deleted file mode 100644
index a0575c6..0000000
--- a/tests/bundles/xenial.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-series: xenial
-relations:
-- - keystone:shared-db
-  - percona-cluster:shared-db
-applications:
-  percona-cluster:
-    series: xenial
-    charm: ../../../percona-cluster
-    num_units: 1
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      token-expiration: 60
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 6bbf1c8..ee6ad4f 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -4,9 +4,6 @@ tests:
    - zaza.openstack.charm_tests.mysql.tests.PerconaClusterColdStartTest
    - zaza.openstack.charm_tests.mysql.tests.PerconaClusterCharmTests
    - zaza.openstack.charm_tests.mysql.tests.PerconaClusterScaleTests
- - xenial_model:
-   - zaza.openstack.charm_tests.mysql.tests.PerconaClusterCharmTests
-   - zaza.openstack.charm_tests.mysql.tests.PerconaClusterScaleTests
  - xenial_series_upgrade_model:
    - zaza.openstack.charm_tests.series_upgrade.tests.XenialBionicSeriesUpgrade
 configure:
@@ -14,10 +11,12 @@ configure:
 target_deploy_status:
 gate_bundles:
   - bionic_model: bionic-ha
-  - xenial_model: xenial-ha
 smoke_bundles:
   - bionic_model: bionic-ha
 dev_bundles:
   - xenial_series_upgrade_model: xenial-queens-ha-series-upgrade
   - bionic_model: bionic-nagios
   - bionic_model: bionic-nagios-ha
+tests_options:
+  force_deploy:
+    - xenial-queens-ha-series-upgrade