diff --git a/plans/optf-has/has/setup.sh b/plans/optf-has/has/setup.sh
index 593a686..db3ec7c 100755
--- a/plans/optf-has/has/setup.sh
+++ b/plans/optf-has/has/setup.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 echo "# aaf-sms setup.sh script";
-source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh
+source ${WORKSPACE}/scripts/optf-has/has/setup-sms.sh
 
 #
 # add here eventual scripts needed for music
diff --git a/plans/optf-has/has/teardown.sh b/plans/optf-has/has/teardown.sh
index 477c7ed..0b2b629 100755
--- a/plans/optf-has/has/teardown.sh
+++ b/plans/optf-has/has/teardown.sh
@@ -33,5 +33,6 @@
 source ${WORKSPACE}/scripts/optf-has/has/music_teardown_script.sh
 
 echo "# aaf-sms teardown.sh script";
-source ${WORKSPACE}/plans/aaf/sms-test-plan/teardown.sh
+kill-instance.sh sms
+kill-instance.sh vault