diff --git a/tests/os_magnum-overrides.yml b/tests/os_magnum-overrides.yml
index a50d2b7..1f40593 100644
--- a/tests/os_magnum-overrides.yml
+++ b/tests/os_magnum-overrides.yml
@@ -1,11 +1,14 @@
 ---
-tempest_main_group: magnum_all
+tempest_run: yes
 
 tempest_plugins:
   - name: magnum
     repo: https://git.openstack.org/openstack/magnum
     branch: master
 
+tempest_test_whitelist:
+  - magnum.tests.functional.api.v1.test_cluster.ClusterTest.test_create_cluster*
+
 tempest_flavors:
   - name: m1.magnum
     id: 100
diff --git a/tests/test-magnum-functional.yml b/tests/test-magnum-functional.yml
deleted file mode 100644
index 955c7a1..0000000
--- a/tests/test-magnum-functional.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# 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.
-
-- name: Playbook for functional testing of magnum
-  hosts: magnum_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 ${RUN_TEMPEST_OPTS} \
-        magnum.tests.functional.api.v1.test_cluster.ClusterTest.test_create_cluster*
-      environment:
-        RUN_TEMPEST_OPTS: "--serial"
-  vars_files:
-    - common/test-vars.yml
-    - magnum-test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index f019961..f3dd646 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -53,8 +53,5 @@
 # Install magnum
 - include: test-install-magnum.yml
 
-# Install tempest
+# Install and execute tempest
 - include: common/test-install-tempest.yml
-
-# Test magnum
-- include: test-magnum-functional.yml