diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 0655270d..890c584f 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -30,3 +30,11 @@
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
   version: master
+- name: openstack_openrc
+  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
+  scm: git
+  version: master
+- name: os_tempest
+  src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
+  scm: git
+  version: master
diff --git a/tests/inventory b/tests/inventory
index 50ccda00..2ed56441 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -26,3 +26,6 @@ memcached_all
 [keystone_all]
 keystone1
 keystone2
+
+[utility_all]
+keystone1
diff --git a/tests/keystone-overrides.yml b/tests/keystone-overrides.yml
index f1fa1336..2e17b9aa 100644
--- a/tests/keystone-overrides.yml
+++ b/tests/keystone-overrides.yml
@@ -1,2 +1,16 @@
 ---
 install_test_packages: True
+
+# TODO:(andymccr) Override until we can merge this into master
+tempest_main_group: utility_all
+
+# TODO:(andymccr) We should fix this in the central-test repo so that we are smarter about this but for now lets hard code it.
+tempest_service_available_aodh: False
+tempest_service_available_ceilometer: False
+tempest_service_available_cinder: False
+tempest_service_available_glance: False
+tempest_service_available_heat: False
+tempest_service_available_horizon: False
+tempest_service_available_neutron: False
+tempest_service_available_nova: False
+tempest_service_available_swift: False
diff --git a/tests/test-keystone-functional.yml b/tests/test-keystone-functional.yml
index 0bca80c1..cd336137 100644
--- a/tests/test-keystone-functional.yml
+++ b/tests/test-keystone-functional.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Test that users/projects etc are consistent on both keystone hosts
 - name: Playbook for functional testing keystone
   hosts: keystone_all
   user: root
@@ -70,3 +71,20 @@
 
   vars_files:
     - playbooks/test-vars.yml
+
+# Run tempest identity tests on one keystone host.
+- name: Playbook for functional testing keystone
+  hosts: keystone_all[0]
+  user: root
+  gather_facts: false
+  tasks:
+    # TODO(andymccr): add credentials functionality to keystone and remove the "credentials" exclusion.
+    - name: Run tempest
+      shell: |
+        . {{ tempest_venv_bin }}/activate
+        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} '^tempest.api.identity((?!credentials).)*$'
+      environment:
+        RUN_TEMPEST_OPTS: "--serial"
+
+  vars_files:
+    - playbooks/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index f71ac3ca..3cbdae4b 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -28,5 +28,8 @@
 # Install Keystone
 - include: playbooks/test-install-keystone.yml
 
+# Install Tempest
+- include: playbooks/test-install-tempest.yml
+
 # Test Keystone
 - include: test-keystone-functional.yml