diff --git a/lib/vhost/test_plan.md b/lib/vhost/test_plan.md
index 9629b610c..a08b7b233 100644
--- a/lib/vhost/test_plan.md
+++ b/lib/vhost/test_plan.md
@@ -12,18 +12,21 @@
 - performs data integrity check using dd to write and read data from the device
 - runs on 3 host systems (Ubuntu 16.04, Centos 7.3 and Fedora 25)
   and 1 guest system (Ubuntu 16.04)
+- runs against vhost scsi and vhost blk
 
 #### FIO Integrity tests
 - NVMe device is split into 4 LUNs, each is attached to separate vhost controller
 - FIO uses job configuration with randwrite mode to verify if random pattern was
   written to and read from correctly on each LUN
 - runs on Fedora 25 and Ubuntu 16.04 guest systems
+- runs against vhost scsi and vhost blk
 
 #### Filesystem integrity
 - runs SPDK with 1 VM with 1 NVMe device attached.
 - creates a partition table and filesystem on passed device, and mounts it
 - runs Linux kernel source compilation
 - Tested file systems: ext2, ext3, ext4, brtfs, ntfs, fat
+- runs against vhost scsi and vhost blk
 
 #### Windows HCK SCSI Compliance Test 2.0.
 - Runs SPDK with 1 VM with Windows Server 2012 R2 operating system
@@ -37,6 +40,21 @@
 - Linux guests run FIO integrity jobs to verify read/write operations,
     while Windows HCK SCSI Compliance Test 2.0 is running on Windows guest
 
+#### vhost hot-remove tests
+- removing NVMe device (unbind from driver) which is already claimed
+    by controller in vhost
+- hotremove tests performed with and without I/O traffic to device
+- I/O traffic, if present in test, has verification enabled
+- checks that vhost and/or VMs do not crash
+- checks that other devices are unaffected by hot-remove of a NVMe device
+- performed against vhost blk and vhost scsi
+
+#### vhost scsi hot-attach and hot-detach tests
+- adding and removing devices via RPC to a controller which is already in use by a VM
+- I/O traffic generated with FIO read/write operations, verification enabled
+- checks that vhost and/or VMs do not crash
+- checks that other devices in the same controller are unaffected by hot-attach
+    and hot-detach operations
 
 
 ### Performance tests
@@ -44,6 +62,7 @@ Tests verifying the performance and efficiency of the module.
 
 #### FIO Performance 6 NVMes
 - SPDK is run on 2 CPU cores
+- Run with vhost scsi
 - 6 VMs are run with 2 cores, 1 controller (2 queues), 1 Split NVMe LUN each
 - FIO configurations runs are 15 minute job combinations of:
     - IO depth: 1, 8, 128