diff --git a/test/iscsi_tgt/ext4test/iscsi.conf.in b/test/iscsi_tgt/ext4test/iscsi.conf.in
index cfda2dccd..588e424ab 100644
--- a/test/iscsi_tgt/ext4test/iscsi.conf.in
+++ b/test/iscsi_tgt/ext4test/iscsi.conf.in
@@ -1,39 +1,13 @@
-# iSCSI target configuration file
-#
-# Please write all parameters using ASCII.
-# The parameter must be quoted if it includes whitespace.
-#
-# Configuration syntax:
-# Spaces at head of line are deleted, other spaces are as separator
-# Lines starting with '#' are comments and not evaluated.
-# Lines ending with '\' are concatenated with the next line.
-# Bracketed keys are section keys grouping the following value keys.
-# Number of section key is used as a tag number.
-#  Ex. [TargetNode1] = TargetNode section key with tag number 1
 [Global]
   Comment "Global section"
-
-  # syslog facility
   LogFacility "local7"
 
 [iSCSI]
-  # node name (not include optional part)
-  # Users can optionally change this to fit their environment.
   NodeBase "iqn.2013-06.com.intel.ch.spdk"
-
   AuthFile /usr/local/etc/spdk/auth.conf
-
-  # socket I/O timeout sec. (polling is infinity)
   Timeout 30
-
-  # authentication information for discovery session
   DiscoveryAuthMethod Auto
-  #DiscoveryAuthGroup AuthGroup9999
-
   MaxSessions 4
-  #MaxConnectionsPerSession 2
-
-
   ImmediateData Yes
   ErrorRecoveryLevel 0
 
diff --git a/test/vhost/fiotest/vhost.conf.in b/test/vhost/fiotest/vhost.conf.in
index d614874ea..d9a9d2709 100644
--- a/test/vhost/fiotest/vhost.conf.in
+++ b/test/vhost/fiotest/vhost.conf.in
@@ -1,34 +1,7 @@
-# vhost configuration file
-#
-# Please write all parameters using ASCII.
-# The parameter must be quoted if it includes whitespace.
-#
-# Configuration syntax:
-# Spaces at head of line are deleted, other spaces are as separator
-# Lines starting with '#' are comments and not evaluated.
-# Lines ending with '\' are concatenated with the next line.
-# Bracketed keys are section keys grouping the following value keys.
-# Number of section key is used as a tag number.
-#  Ex. [TargetNode1] = TargetNode section key with tag number 1
 [Global]
-  # Users can restrict work items to only run on certain cores by
-  #  specifying a WorkerMask.  Default is to allow work items to run
-  #  on all cores.
-  #WorkerMask 0xFFFF
-
-  # Event mask for ids history buffers
-  # Default: 0x0 (all events disabled)
-  # Set to 0xFFFFFFFFFFFFFFFF to enable all events.
-  #EventMask 0x0
-
-  # syslog facility
   LogFacility "local7"
 
 [Rpc]
-  # Defines whether vhost will enable configuration via RPC.
-  # Default is disabled.  Note that the RPC interface is not
-  # authenticated, so users should be careful about enabling
-  # RPC in non-trusted environments.
   Enable Yes
 
 [Ioat]
diff --git a/test/vhost/integrity/vhost.conf.in b/test/vhost/integrity/vhost.conf.in
index 039bfe102..39edd5b56 100644
--- a/test/vhost/integrity/vhost.conf.in
+++ b/test/vhost/integrity/vhost.conf.in
@@ -1,34 +1,7 @@
-# spdk configuration file
-#
-# Please write all parameters using ASCII.
-# The parameter must be quoted if it includes whitespace.
-#
-# Configuration syntax:
-# Spaces at head of line are deleted, other spaces are as separator
-# Lines starting with '#' are comments and not evaluated.
-# Lines ending with '\' are concatenated with the next line.
-# Bracketed keys are section keys grouping the following value keys.
-# Number of section key is used as a tag number.
-#  Ex. [TargetNode1] = TargetNode section key with tag number 1
 [Global]
-  # Users can restrict work items to only run on certain cores by
-  #  specifying a WorkerMask.  Default is to allow work items to run
-  #  on all cores.
-  #WorkerMask 0xFFFF
-
-  # Event mask for ids history buffers
-  # Default: 0x0 (all events disabled)
-  # Set to 0xFFFFFFFFFFFFFFFF to enable all events.
-  #EventMask 0x0
-
-  # syslog facility
   LogFacility "local7"
 
 [Rpc]
-  # Defines whether ids will enable configuration via RPC.
-  # Default is disabled.  Note that the RPC interface is not
-  # authenticated, so users should be careful about enabling
-  # RPC in non-trusted environments.
   Enable Yes
 
 [Ioat]