diff --git a/.gitignore b/.gitignore
index a958ad5b..5c68cf0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ func-results.json
 .local
 __pycache__
 .stestr
+.idea
diff --git a/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/bundles/overlays/local-charm-overlay.yaml.j2
index aefcfe3d..8d5b7304 100644
--- a/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -2,7 +2,7 @@
 applications:
   keystone:
     options:
-      vip: {{ AMULET_OS_VIP00 }}
+      vip: '{{ OS_VIP00 }}'
   hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 6e4f37d9..be712307 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -2,6 +2,7 @@ charm_name: keystone
 smoke_bundles:
 - bionic-stein
 gate_bundles:
+- disco-stein
 - bionic-stein
 - bionic-rocky
 - bionic-queens
@@ -10,10 +11,7 @@ gate_bundles:
 - xenial-ocata
 - xenial-mitaka
 - trusty-mitaka
-dev_bundles:
-- disco-stein
-comment: |
-  disable ``disco-stein`` test pending LP: #1823718
+comment:
   the glance configure job validates operation of identity-service relation
 configure:
 - zaza.openstack.charm_tests.glance.setup.add_lts_image
diff --git a/tox.ini b/tox.ini
index 7dec4bc7..5ad6553e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,12 +9,11 @@ skipsdist = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          CHARM_DIR={envdir}
-         AMULET_SETUP_TIMEOUT=5400
 install_command =
   pip install {opts} {packages}
 commands = stestr run {posargs}
 whitelist_externals = juju
-passenv = HOME TERM AMULET_* CS_API_*
+passenv = HOME TERM CS_API_* OS_*
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:py35]