diff --git a/metadata.yaml b/metadata.yaml
index 8ecafdb3..497ae135 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -13,7 +13,6 @@ series:
   - xenial
   - bionic
   - eoan
-  - disco
   - trusty
 provides:
   amqp:
diff --git a/tests/bundles/disco-stein.yaml b/tests/bundles/disco-stein.yaml
deleted file mode 100644
index c9b03219..00000000
--- a/tests/bundles/disco-stein.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: disco
-
-relations:
-  - - cinder:amqp
-    - rabbitmq-server:amqp
-  - - cinder:shared-db
-    - percona-cluster:shared-db
-  - - cinder:identity-service
-    - keystone:identity-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - nrpe:nrpe-external-master
-    - rabbitmq-server:nrpe-external-master
-
-applications:
-  rabbitmq-server:
-    charm: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      admin-token: ubuntutesting
-  nrpe:
-    charm: cs:nrpe
diff --git a/tests/tests.yaml b/tests/tests.yaml
index e932424a..ba4277d2 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -12,7 +12,5 @@ gate_bundles:
   - bionic-stein
   - bionic-train
 dev_bundles:
-# Tests failing, investigate
-  - disco-stein
 tests:
   - zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests