diff --git a/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml
index 0144abdaf..dd81ff5cd 100644
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml
+++ b/playbooks/legacy/senlin-dsvm-tempest-py27-functional/run.yaml
@@ -51,6 +51,7 @@
 
           export PROJECTS="openstack/senlin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
+
           export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
 
diff --git a/playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml
index f99d0d9ea..b3a6c8d1b 100644
--- a/playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml
+++ b/playbooks/legacy/senlin-dsvm-tempest-py27-integration/run.yaml
@@ -39,16 +39,16 @@
           export DEVSTACK_GATE_USE_PYTHON3=False
 
           export SENLIN_TEST_TYPE="integration"
-          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}"
+          export SENLIN_BACKEND="openstack"
+          export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.integration"
 
           services=rabbit,mysql,dstat,key,tempest
           services+=,g-api,g-reg
           services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          # placement services mandatory for nova from ocata
           if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
              services+=,placement-api,placement-client
           fi
-          services+=,c-sch,c-api,c-vol,c-bak
+          # services+=,c-sch,c-api,c-vol,c-bak
           services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
 
           export PROJECTS="openstack/senlin $PROJECTS"
@@ -70,8 +70,6 @@
           export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/zaqar-tempest-plugin'"
 
-          export SENLIN_BACKEND="openstack"
-
           # use senlin-tempest-plugin
           export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
@@ -84,13 +82,13 @@
 
           function pre_test_hook {
               cd /opt/stack/new/senlin/senlin/tests/tempest/
-              ./pre_test_hook.sh
+              source ./pre_test_hook.sh
           }
           export -f pre_test_hook
 
           function post_test_hook {
               cd /opt/stack/new/senlin/senlin/tests/tempest/
-              ./post_test_hook.sh senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}
+              source ./post_test_hook.sh
           }
           export -f post_test_hook
 
diff --git a/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml
index 3dda17809..85ac5054f 100644
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml
+++ b/playbooks/legacy/senlin-dsvm-tempest-py35-functional/run.yaml
@@ -52,6 +52,7 @@
 
           export PROJECTS="openstack/senlin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
+
           export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
 
diff --git a/playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml b/playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml
index 2ff6a1be1..212dd5184 100644
--- a/playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml
+++ b/playbooks/legacy/senlin-dsvm-tempest-py35-integration/run.yaml
@@ -39,20 +39,21 @@
           export DEVSTACK_GATE_USE_PYTHON3=True
 
           export SENLIN_TEST_TYPE="integration"
+          export SENLIN_BACKEND="openstack"
           export DEVSTACK_GATE_TEMPEST_REGEX="senlin_tempest_plugin.tests.integration"
 
           services=rabbit,mysql,dstat,key,tempest
           services+=,g-api,g-reg
           services+=,n-api,n-cpu,n-cond,n-sch,n-crt
-          # placement services mandatory for nova from ocata
           if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
              services+=,placement-api,placement-client
           fi
-          services+=,c-sch,c-api,c-vol,c-bak
+          # services+=,c-sch,c-api,c-vol,c-bak
           services+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
 
           export PROJECTS="openstack/senlin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
+
           export PROJECTS="openstack/heat $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
 
@@ -73,7 +74,6 @@
           export PROJECTS="openstack/senlin-tempest-plugin $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/senlin-tempest-plugin'"
 
-          export SENLIN_BACKEND="openstack"
           export OVERRIDE_ENABLED_SERVICES=$services
 
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -82,13 +82,13 @@
 
           function pre_test_hook {
               cd /opt/stack/new/senlin/senlin/tests/tempest/
-              ./pre_test_hook.sh
+              source ./pre_test_hook.sh
           }
           export -f pre_test_hook
 
           function post_test_hook {
               cd /opt/stack/new/senlin/senlin/tests/tempest/
-              ./post_test_hook.sh senlin_tempest_plugin.tests.${SENLIN_TEST_TYPE}
+              source ./post_test_hook.sh
           }
           export -f post_test_hook