diff --git a/.gitignore b/.gitignore
index 53a7668e..b57b99d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,9 +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_nova-overrides-lxd.yml b/tests/os_nova-overrides-lxd.yml
index 1c4fc770..b0a8f19b 100644
--- a/tests/os_nova-overrides-lxd.yml
+++ b/tests/os_nova-overrides-lxd.yml
@@ -15,6 +15,10 @@
 
 nova_virt_type: lxd
 
+tempest_run: yes
+tempest_venv_tag: "{{ tempest_git_install_branch }}"
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
+tempest_log_dir: "/var/log/"
 tempest_img_url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-lxc.tar.gz"
 tempest_img_disk_format: raw
 tempest_image_file: "cirros-0.3.4-x86_64-lxc.tar.gz"
@@ -22,7 +26,8 @@ tempest_img_name: "cirros"
 tempest_images:
   - url: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-lxc.tar.gz"
     sha256: "e8172c603fad47f4c95e67bd2751c2977e07164c9ebdfcf3f9c1d7ff598ed217"
-
+tempest_test_whitelist:
+  - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
 neutron_provider_networks:
   network_types: "vxlan,flat"
   network_mappings: "flat:eth12"
diff --git a/tests/os_nova-overrides.yml b/tests/os_nova-overrides.yml
index b3604176..0008bc9e 100644
--- a/tests/os_nova-overrides.yml
+++ b/tests/os_nova-overrides.yml
@@ -13,6 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+tempest_run: yes
+tempest_venv_tag: "{{ tempest_git_install_branch }}"
+tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
+tempest_log_dir: "/var/log/"
+tempest_test_whitelist:
+  - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
+
 neutron_provider_networks:
   network_types: "vxlan,flat"
   network_mappings: "flat:eth12"
diff --git a/tests/test-nova-functional.yml b/tests/test-nova-functional.yml
deleted file mode 100644
index 16aedd8a..00000000
--- a/tests/test-nova-functional.yml
+++ /dev/null
@@ -1,30 +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 nova
-  hosts: utility_all[0]
-  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.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
-      register: run_tempest
-      until: run_tempest|success
-      retries: 3
-      delay: 5
-  vars_files:
-    - common/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index a3f6e4e5..679c24d4 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -39,6 +39,3 @@
 
 # Install Tempest
 - include: common/test-install-tempest.yml
-
-# Test Nova
-- include: test-nova-functional.yml