diff --git a/.gitignore b/.gitignore
index 9d880601..323e5362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ trusty
 .stestr
 func-results.json
 __pycache__
+tempest-workspace
+tempest.log
diff --git a/test-requirements.txt b/test-requirements.txt
index 7d9c2587..123b45ea 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,3 +16,5 @@ coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
+tempest;python_version<'3.6'
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
index a060497d..21e32944 100644
--- a/tests/bundles/bionic-ussuri.yaml
+++ b/tests/bundles/bionic-ussuri.yaml
@@ -8,6 +8,7 @@ machines:
     constraints: mem=3072M
   '1':
   '2':
+    constraints: mem=3072M
 
 relations:
   - ["keystone:shared-db", "mysql:shared-db"]
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 8b06393d..06d16501 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -4,7 +4,7 @@ comment:
   - 'the glance configure job validates operation of identity-service relation'
 
 smoke_bundles:
-  - bionic-train
+  - full_run: bionic-train
 gate_bundles:
   - trusty-mitaka
   - xenial-mitaka
@@ -24,12 +24,24 @@ dev_bundles:
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
-
+  - full_run:
+    - zaza.openstack.charm_tests.glance.setup.add_cirros_image
+    - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
+    - zaza.openstack.charm_tests.keystone.setup.add_demo_user
+    - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
+    - zaza.openstack.charm_tests.tempest.setup.render_tempest_config_keystone_v3
 tests:
   - zaza.openstack.charm_tests.glance.tests.GlanceTest
   - zaza.openstack.charm_tests.policyd.tests.GlanceTests
+  - full_run:
+    - zaza.openstack.charm_tests.tempest.tests.TempestTest
+    - zaza.openstack.charm_tests.glance.tests.GlanceTest
+    - zaza.openstack.charm_tests.policyd.tests.GlanceTests
 
 tests_options:
+  tempest:
+    full_run:
+      smoke: True
   policyd:
     service: glance
   force_deploy: