diff --git a/test/spdkcli/match_files/spdkcli_vhost.test.match b/test/spdkcli/match_files/spdkcli_vhost.test.match
index eed2e1f9c..faed2b99b 100644
--- a/test/spdkcli/match_files/spdkcli_vhost.test.match
+++ b/test/spdkcli/match_files/spdkcli_vhost.test.match
@@ -21,7 +21,8 @@ o- / ...........................................................................
   | | o- null_bdev0 $(S) [$(UUID), Size=$(FP)M, Not claimed]
   | | o- null_bdev1 $(S) [$(UUID), Size=$(FP)M, Not claimed]
   | o- nvme ............................................................................................................. [Bdevs: 1]
-  | | o- Nvme0n1 $(S) [Size=$(S), Claimed]
+$(OPT)  | | o- Nvme0n1 $(S) [Size=$(S), Claimed]
+$(OPX)  | | o- Nvme0n1 $(S) [$(UUID), Size=$(S), Claimed]
   | o- pmemblk .......................................................................................................... [Bdevs: 0]
   | o- raid_volume ...................................................................................................... [Bdevs: 0]
   | o- rbd .............................................................................................................. [Bdevs: 0]