diff --git a/src/tests/bundles/eoan-full-ha.yaml b/src/tests/bundles/eoan-full-ha.yaml
new file mode 120000
index 0000000..9ff0fc6
--- /dev/null
+++ b/src/tests/bundles/eoan-full-ha.yaml
@@ -0,0 +1 @@
+eoan-full.yaml
\ No newline at end of file
diff --git a/src/tests/bundles/eoan-full.yaml b/src/tests/bundles/eoan-full.yaml
new file mode 100644
index 0000000..609dcd1
--- /dev/null
+++ b/src/tests/bundles/eoan-full.yaml
@@ -0,0 +1,69 @@
+series: eoan
+relations:
+- ["cinder:shared-db", "cinder-mysql-router:shared-db"]
+- ["cinder-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+- ["keystone:shared-db", "keystone-mysql-router:shared-db"]
+- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+- ["glance:shared-db", "glance-mysql-router:shared-db"]
+- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+- ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"]
+- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+- ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
+- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
+- ["cinder:identity-service", "keystone:identity-service"]
+- ["cinder:amqp", "rabbitmq-server:amqp" ]
+- ["glance:identity-service", "keystone:identity-service"]
+- ["memcached:cache", "nova-cloud-controller:memcache"]
+- ["neutron-api:identity-service", "keystone:identity-service"]
+- ["neutron-api:amqp", "rabbitmq-server:amqp" ]
+- ["nova-cloud-controller:amqp", "rabbitmq-server:amqp" ]
+- ["nova-cloud-controller:cloud-compute", "nova-compute:cloud-compute" ]
+- ["nova-cloud-controller:identity-service", "keystone:identity-service" ]
+- ["nova-cloud-controller:image-service", "glance:image-service" ]
+- ["nova-compute:amqp", "rabbitmq-server:amqp" ]
+- ["nova-compute:image-service", "glance:image-service" ]
+- ["placement:placement", "nova-cloud-controller:placement"]
+- ["placement:identity-service", "keystone:identity-service"]
+- ["placement:shared-db", "mysql-innodb-cluster:shared-db"]
+applications:
+  cinder-mysql-router:
+    charm: ../../../mysql-router
+  keystone-mysql-router:
+    charm: ../../../mysql-router
+  glance-mysql-router:
+    charm: ../../../mysql-router
+  nova-mysql-router:
+    charm: ../../../mysql-router
+  neutron-mysql-router:
+    charm: ../../../mysql-router
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+  memcached:
+    charm: cs:memcached
+    num_units: 1
+    series: bionic
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
diff --git a/src/tests/bundles/eoan.yaml b/src/tests/bundles/eoan.yaml
index d131fae..474bc89 100644
--- a/src/tests/bundles/eoan.yaml
+++ b/src/tests/bundles/eoan.yaml
@@ -9,8 +9,6 @@ applications:
     series: eoan
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
     num_units: 3
-    options:
-      source: distro-proposed
   keystone:
     series: eoan
     charm: cs:~openstack-charmers-next/keystone
diff --git a/src/tests/bundles/overlays/eoan-full-ha.yaml.j2 b/src/tests/bundles/overlays/eoan-full-ha.yaml.j2
new file mode 120000
index 0000000..492bbb8
--- /dev/null
+++ b/src/tests/bundles/overlays/eoan-full-ha.yaml.j2
@@ -0,0 +1 @@
+eoan-ha.yaml.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/eoan-ha.yaml.j2 b/src/tests/bundles/overlays/eoan-ha.yaml.j2
new file mode 100644
index 0000000..2d8fd26
--- /dev/null
+++ b/src/tests/bundles/overlays/eoan-ha.yaml.j2
@@ -0,0 +1,16 @@
+applications:
+  keystone:
+    num_units: 3
+    options:
+      vip: {{TEST_VIP00}}
+  nova-cloud-controller:
+    num_units: 3
+    options:
+      vip: {{TEST_VIP01}}
+  keystone-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+  nova-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+relations:
+- ["keystone:ha", "keystone-hacluster:ha"]
+- ["nova-cloud-controller:ha", "nova-hacluster:ha"]
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 8d0c7aa..5ba8d76 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,11 +1,13 @@
 charm_name: mysql-router
 configure:
 - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+- full_model:
+    - zaza.openstack.charm_tests.glance.setup.add_lts_image
 tests:
-# Validates DB connectivity
 - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 dev_bundles:
 gate_bundles:
 - eoan
+- full_model: eoan-full-ha
 smoke_bundles:
 - eoan