diff --git a/.gitignore b/.gitignore
index 21adf3c5..b57b99d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,11 +61,8 @@ ChangeLog
 releasenotes/build
 
 # Test temp files
-tests/plugins
-tests/playbooks
-tests/test.retry
+tests/common
+tests/*.retry
 
 # Vagrant artifacts
 .vagrant
-
-
diff --git a/tests/os_cinder-overrides.yml b/tests/os_cinder-overrides.yml
new file mode 100644
index 00000000..0909a9f0
--- /dev/null
+++ b/tests/os_cinder-overrides.yml
@@ -0,0 +1,24 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+tempest_run: yes
+
+tempest_plugins:
+  - name: cinder
+    repo: https://git.openstack.org/openstack/cinder
+    branch: master
+
+tempest_test_whitelist:
+  - cinder.tests.tempest.api.volume.*
diff --git a/tests/test-cinder-functional.yml b/tests/test-cinder-functional.yml
deleted file mode 100644
index be2c7417..00000000
--- a/tests/test-cinder-functional.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Copyright 2015, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Playbook for functional testing of cinder
-  hosts: cinder_api
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Check the cinder-api
-      uri:
-        url: "http://localhost:8776"
-        status_code: 200,300
-
-- name: Playbook for tempest testing of cinder
-  hosts: utility_all
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Run tempest
-      shell: |
-        . {{ tempest_venv_bin }}/activate
-        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env --serial tempest.api.volume.test_volumes_get
-  vars_files:
-    - common/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index 171570fa..0282f17a 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -28,8 +28,5 @@
 # Install Cinder
 - include: common/test-install-cinder.yml
 
-# Install Tempest
+# Install and execute Tempest
 - include: common/test-install-tempest.yml
-
-# Test Cinder
-- include: test-cinder-functional.yml