diff --git a/test/openstack/run_openstack_tests.sh b/test/openstack/run_openstack_tests.sh
index 9d61a0a7e..38ccf9f6e 100755
--- a/test/openstack/run_openstack_tests.sh
+++ b/test/openstack/run_openstack_tests.sh
@@ -13,26 +13,21 @@ function finish_test {
 	{
 	  "$rpc_py" bdev_lvol_delete_lvstore -l lvs0
 	  kill -9 $rpc_proxy_pid
-	  killprocess $nvmfpid
 	  rm "$testdir/conf.json"
 	} || :
 }
 
-trap "finish_test" SIGINT SIGTERM EXIT
-
 cat <<-JSON >"$testdir/conf.json"
 	{"subsystems":[
 	$("$rootdir/scripts/gen_nvme.sh" --json)
 	]}
 JSON
 
-timing_enter run_spdk_tgt
-"$rootdir/app/spdk_tgt/spdk_tgt" -m 0x3 -p 0 -s 1024 --json "$testdir/conf.json" &
-nvmfpid=$!
-waitforlisten $nvmfpid
-$rpc_py bdev_nvme_set_hotplug -e
-timing_exit run_spdk_tgt
+nvmfappstart "-m 0x3 -p 0 -s 1024 --json $testdir/conf.json"
 
+trap 'finish_test; process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
+
+$rpc_py bdev_nvme_set_hotplug -e
 timing_enter run_rpc_proxy
 $rootdir/scripts/rpc_http_proxy.py 127.0.0.1 3333 secret secret &
 rpc_proxy_pid=$!