diff --git a/autotest.sh b/autotest.sh
index c5f31a2ce..6bfbe0c68 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -151,10 +151,6 @@ if [ $SPDK_TEST_VHOST -eq 1 ]; then
 		run_test ./test/vhost/spdk_vhost.sh --integrity
 		timing_exit integrity
 
-		timing_enter readonly
-		run_test ./test/vhost/spdk_vhost.sh --readonly
-		timing_exit readonly
-
 		# timing_enter fs_integrity_scsi
 		# run_test ./test/vhost/spdk_vhost.sh --fs-integrity-scsi
 		# timing_exit fs_integrity_scsi
@@ -172,6 +168,12 @@ if [ $SPDK_TEST_VHOST -eq 1 ]; then
 		timing_exit integrity_lvol_blk_nightly
 	fi
 
+	if [ $RUN_NIGHTLY_FAILING -eq 1 ]; then
+		timing_enter readonly
+		run_test ./test/vhost/spdk_vhost.sh --readonly
+		timing_exit readonly
+	fi
+
 	timing_enter integrity_lvol_scsi
 	run_test ./test/vhost/spdk_vhost.sh --integrity-lvol-scsi
 	timing_exit integrity_lvol_scsi
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index 5f891f7ad..0cf3024a0 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -12,6 +12,9 @@ ulimit -c unlimited
 : ${RUN_NIGHTLY:=0}
 export RUN_NIGHTLY
 
+: ${RUN_NIGHTLY_FAILING:=0}
+export RUN_NIGHTLY_FAILING
+
 if [[ ! -z $1 ]]; then
 	if [ -f $1 ]; then
 		source $1
diff --git a/test/lib/bdev/blockdev.sh b/test/lib/bdev/blockdev.sh
index 48740bd25..9bf8a968c 100755
--- a/test/lib/bdev/blockdev.sh
+++ b/test/lib/bdev/blockdev.sh
@@ -10,7 +10,7 @@ function run_fio()
 {
 	if [ $RUN_NIGHTLY -eq 0 ]; then
 		LD_PRELOAD=$plugindir/fio_plugin /usr/src/fio/fio --ioengine=spdk_bdev --iodepth=8 --bs=4k --runtime=10 $testdir/bdev.fio "$@"
-	else
+	elif [ $RUN_NIGHTLY_FAILING -eq 1 ]; then
 		# Use size 192KB which both exceeds typical 128KB max NVMe I/O
 		#  size and will cross 128KB Intel DC P3700 stripe boundaries.
 		LD_PRELOAD=$plugindir/fio_plugin /usr/src/fio/fio --ioengine=spdk_bdev --iodepth=128 --bs=192k --runtime=100 $testdir/bdev.fio "$@"
diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh
index c5f55e307..dca1722b4 100755
--- a/test/nvmf/nvmf.sh
+++ b/test/nvmf/nvmf.sh
@@ -39,7 +39,7 @@ if [ $SPDK_TEST_NVML -eq 1 ]; then
 	fi
 fi
 
-if [ $RUN_NIGHTLY -eq 1 ]; then
+if [ $RUN_NIGHTLY_FAILING -eq 1 ]; then
 	run_test test/nvmf/multiconnection/multiconnection.sh
 fi