diff --git a/autotest.sh b/autotest.sh
index 94a93d1eb..3a7cce26a 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -234,10 +234,12 @@ if [ $SPDK_TEST_LVOL -eq 1 ]; then
 fi
 
 if [ $SPDK_TEST_VHOST_INIT -eq 1 ]; then
+	timing_enter vhost_initiator
 	run_test suite ./test/vhost/initiator/blockdev.sh
 	run_test suite ./test/vhost/initiator/json_config.sh
 	run_test suite ./test/spdkcli/virtio.sh
 	report_test_completion "vhost_initiator"
+	timing_exit vhost_initiator
 fi
 
 if [ $SPDK_TEST_PMDK -eq 1 ]; then
diff --git a/test/spdkcli/virtio.sh b/test/spdkcli/virtio.sh
index fd8260be1..77bf1aa66 100755
--- a/test/spdkcli/virtio.sh
+++ b/test/spdkcli/virtio.sh
@@ -5,7 +5,7 @@ testdir=$(readlink -f $(dirname $0))
 . $testdir/common.sh
 
 trap 'killprocess $virtio_pid; on_error_exit' ERR
-timing_enter spdk_cli_vhost
+timing_enter spdk_cli_vhost_init
 
 timing_enter run_spdk_tgt
 run_spdk_tgt
@@ -41,16 +41,16 @@ if [ ! -z $pci_blk ]  && [ ! -z $pci_scsi ]; then
 fi
 timing_exit spdkcli_check_match
 
-timing_exit spdkcli_create_virtio_user_config
+timing_enter spdkcli_create_virtio_user_config
 $spdkcli_job "/bdevs/virtioblk_disk create virtioblk_user user $testdir/../../sample_block" "virtioblk_user" True "/var/tmp/virtio.sock"
 $spdkcli_job "/bdevs/virtioscsi_disk create virtioscsi_user user $testdir/../../sample_scsi" "virtioscsi_user" True "/var/tmp/virtio.sock"
 timing_exit spdkcli_create_virtio_user_config
 
-timing_enter spdkcli_check_match
+timing_enter spdkcli_check_match_user_config
 MATCH_FILE="spdkcli_virtio_user.test"
 SPDKCLI_BRANCH="/vhost"
 check_match
-timing_exit spdkcli_check_match
+timing_exit spdkcli_check_match_user_config
 
 timing_enter spdkcli_clear_virtio_config
 $spdkcli_job "/bdevs/virtioscsi_disk delete virtioscsi_user" "" False "/var/tmp/virtio.sock"
@@ -71,4 +71,4 @@ timing_exit spdkcli_clear_virtio_config
 killprocess $virtio_pid
 killprocess $spdk_tgt_pid
 
-timing_exit spdk_cli_vhost
+timing_exit spdk_cli_vhost_init