diff --git a/test/spdkcli/common.sh b/test/spdkcli/common.sh
index 42fad0858..a1b114858 100644
--- a/test/spdkcli/common.sh
+++ b/test/spdkcli/common.sh
@@ -21,19 +21,19 @@ function on_error_exit() {
 }
 
 function run_spdk_tgt() {
-	$SPDK_BIN_DIR/spdk_tgt -m 0x3 -p 0 -s 4096 &
+	$SPDK_BIN_DIR/spdk_tgt -m 0x3 -p 0 &
 	spdk_tgt_pid=$!
 	waitforlisten $spdk_tgt_pid
 }
 
 function run_nvmf_tgt() {
-	$SPDK_BIN_DIR/nvmf_tgt -m 0x3 -p 0 -s 4096 &
+	$SPDK_BIN_DIR/nvmf_tgt -m 0x3 -p 0 &
 	nvmf_tgt_pid=$!
 	waitforlisten $nvmf_tgt_pid
 }
 
 function run_vhost_tgt() {
-	$SPDK_BIN_DIR/vhost -m 0x3 -p 0 -s 4096 &
+	$SPDK_BIN_DIR/vhost -m 0x3 -p 0 &
 	vhost_tgt_pid=$!
 	waitforlisten $vhost_tgt_pid
 }
@@ -43,6 +43,3 @@ function check_match() {
 	$rootdir/test/app/match/match $testdir/match_files/${MATCH_FILE}.match
 	rm -f $testdir/match_files/${MATCH_FILE}
 }
-
-# Allocate 5GB of hugepages to have some overhead for run_*()s
-HUGEMEM=5120 CLEAR_HUGE=yes "$rootdir/scripts/setup.sh"
diff --git a/test/spdkcli/iscsi.sh b/test/spdkcli/iscsi.sh
index ff892ab36..81b2dc950 100755
--- a/test/spdkcli/iscsi.sh
+++ b/test/spdkcli/iscsi.sh
@@ -14,7 +14,7 @@ trap 'on_error_exit;' ERR
 timing_enter run_iscsi_tgt
 
 # Running iscsi target with --wait-for-rpc. Implies framework_start_init later
-$SPDK_BIN_DIR/iscsi_tgt -m 0x3 -p 0 -s 4096 --wait-for-rpc &
+$SPDK_BIN_DIR/iscsi_tgt -m 0x3 -p 0 --wait-for-rpc &
 iscsi_tgt_pid=$!
 waitforlisten $iscsi_tgt_pid
 $rootdir/scripts/rpc.py framework_start_init
diff --git a/test/spdkcli/tcp.sh b/test/spdkcli/tcp.sh
index d0d4dafba..69c80642f 100755
--- a/test/spdkcli/tcp.sh
+++ b/test/spdkcli/tcp.sh
@@ -18,7 +18,7 @@ PORT="9998"
 trap 'err_cleanup; exit 1' SIGINT SIGTERM EXIT
 
 timing_enter run_spdk_tgt_tcp
-$SPDK_BIN_DIR/spdk_tgt -m 0x3 -p 0 -s 2048 &
+$SPDK_BIN_DIR/spdk_tgt -m 0x3 -p 0 &
 spdk_tgt_pid=$!
 
 waitforlisten $spdk_tgt_pid
diff --git a/test/spdkcli/virtio.sh b/test/spdkcli/virtio.sh
index b483e0562..862482445 100755
--- a/test/spdkcli/virtio.sh
+++ b/test/spdkcli/virtio.sh
@@ -12,7 +12,7 @@ run_spdk_tgt
 timing_exit run_spdk_tgt
 
 timing_enter run_spdk_virtio
-$SPDK_BIN_DIR/spdk_tgt -m 0x4 -p 0 -g -u -s 1024 -r /var/tmp/virtio.sock &
+$SPDK_BIN_DIR/spdk_tgt -m 0x4 -p 0 -g -u -r /var/tmp/virtio.sock &
 virtio_pid=$!
 waitforlisten $virtio_pid /var/tmp/virtio.sock
 timing_exit run_spdk_virtio