diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh
index 4e4700af4..23bf8b0b9 100755
--- a/test/spdkcli/iscsi.sh
+++ b/test/spdkcli/iscsi.sh
@@ -38,7 +38,7 @@ $spdkcli_job "/iscsi ls" "Malloc" True
 timing_exit spdkcli_create_iscsi_config
 
 timing_enter spdkcli_check_match
-#check_match
+check_match
 timing_exit spdkcli_check_match
 
 timing_enter spdkcli_clear_iscsi_config
diff --git a/test/spdkcli/match_files/spdkcli_iscsi.test.match b/test/spdkcli/match_files/spdkcli_iscsi.test.match
new file mode 100644
index 000000000..e48d8d98f
--- /dev/null
+++ b/test/spdkcli/match_files/spdkcli_iscsi.test.match
@@ -0,0 +1,53 @@
+o- iscsi ..................................................................................................................... [...]
+  o- auth_groups ....................................................................................................... [Groups: 1]
+  | o- group1 ......................................................................................................... [Secrets: 2]
+  |   o- user=test2, secret=test2, muser=mutual_test2, msecret=mutual_test2 .................................................. [...]
+  |   o- user=test3, secret=test3, muser=mutual_test3, msecret=mutual_test3 .................................................. [...]
+  o- global_params ........................................................................................................... [...]
+  | o- allow_duplicated_isid: False .......................................................................................... [...]
+  | o- chap_group: 1 ......................................................................................................... [...]
+  | o- default_time2retain: 20 ............................................................................................... [...]
+  | o- default_time2wait: 2 .................................................................................................. [...]
+  | o- disable_chap: True .................................................................................................... [...]
+  | o- error_recovery_level: 0 ............................................................................................... [...]
+  | o- first_burst_length: 8192 .............................................................................................. [...]
+  | o- immediate_data: True .................................................................................................. [...]
+  | o- max_connections_per_session: 2 ........................................................................................ [...]
+  | o- max_queue_depth: 64 ................................................................................................... [...]
+  | o- max_sessions: 128 ..................................................................................................... [...]
+  | o- min_connections_per_core: 4 ........................................................................................... [...]
+  | o- mutual_chap: False .................................................................................................... [...]
+  | o- node_base: iqn.2016-06.io.spdk ........................................................................................ [...]
+  | o- nop_in_interval: 30 ................................................................................................... [...]
+  | o- nop_timeout: 60 ....................................................................................................... [...]
+  | o- require_chap: False ................................................................................................... [...]
+  o- initiator_groups ........................................................................................ [Initiator groups: 2]
+  | o- initiator_group2 ............................................................................................ [Initiators: 2]
+  | | o- hostname=ANW, netmask=$(N).$(N).$(N).$(N)/32 $(S) [...]
+  | | o- hostname=ANY, netmask=$(N).$(N).$(N).$(N)/32 $(S) [...]
+  | o- initiator_group3 ............................................................................................ [Initiators: 1]
+  |   o- hostname=ANZ, netmask=$(N).$(N).$(N).$(N)/32 $(S) [...]
+  o- iscsi_connections ............................................................................................ [Connections: 0]
+  o- portal_groups .............................................................................................. [Portal groups: 2]
+  | o- portal_group1 .................................................................................................. [Portals: 2]
+  | | o- host=127.0.0.1, port=3261, cpumask=0x3 .............................................................................. [...]
+  | | o- host=127.0.0.1, port=3263, cpumask=0x1 .............................................................................. [...]
+  | o- portal_group2 .................................................................................................. [Portals: 1]
+  |   o- host=127.0.0.1, port=3262, cpumask=0x3 .............................................................................. [...]
+  o- target_nodes ................................................................................................ [Target nodes: 2]
+    o- iqn.2016-06.io.spdk:Target0 ......................................................................... [Id: 0, QueueDepth: 64]
+    | o- auths ........................................ [disable_chap: True, require_chap: False, mutual_chap: False, chap_group: 1]
+    | o- luns ............................................................................................................ [Luns: 2]
+    | | o- lun 0 ......................................................................................................... [Malloc0]
+    | | o- lun 1 ......................................................................................................... [Malloc1]
+    | o- pg_ig_maps ................................................................................................ [Pg_ig_maps: 3]
+    |   o- portal_group1 - initiator_group2 .................................................................................. [...]
+    |   o- portal_group1 - initiator_group3 .................................................................................. [...]
+    |   o- portal_group2 - initiator_group2 .................................................................................. [...]
+    o- iqn.2016-06.io.spdk:Target1 ......................................................................... [Id: 1, QueueDepth: 64]
+      o- auths ....................................... [disable_chap: False, require_chap: False, mutual_chap: False, chap_group: 1]
+      o- luns ............................................................................................................ [Luns: 2]
+      | o- lun 0 ......................................................................................................... [Malloc2]
+      | o- lun 2 ......................................................................................................... [Malloc3]
+      o- pg_ig_maps ................................................................................................ [Pg_ig_maps: 1]
+        o- portal_group1 - initiator_group2 .................................................................................. [...]