diff --git a/test/bdev/blockdev.sh b/test/bdev/blockdev.sh
index 348d3a5b8..43c93cf1f 100755
--- a/test/bdev/blockdev.sh
+++ b/test/bdev/blockdev.sh
@@ -192,13 +192,7 @@ function fio_test_suite() {
 		echo "filename=$b" >> $testdir/bdev.fio
 	done
 
-	if [ $RUN_NIGHTLY_FAILING -eq 0 ]; then
-		local fio_params="--ioengine=spdk_bdev --iodepth=8 --bs=4k --runtime=10 $testdir/bdev.fio --spdk_json_conf=$conf_file"
-	else
-		# Use size 192KB which both exceeds typical 128KB max NVMe I/O
-		#  size and will cross 128KB Intel DC P3700 stripe boundaries.
-		local fio_params="--ioengine=spdk_bdev --iodepth=128 --bs=192k --runtime=100 $testdir/bdev.fio --spdk_json_conf=$conf_file"
-	fi
+	local fio_params="--ioengine=spdk_bdev --iodepth=8 --bs=4k --runtime=10 $testdir/bdev.fio --spdk_json_conf=$conf_file"
 
 	run_test "bdev_fio_rw_verify" fio_bdev $fio_params --spdk_mem=$PRE_RESERVED_MEM \
 	--output=$output_dir/blockdev_fio_verify.txt
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index c3b276152..81b22115d 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -54,9 +54,6 @@ fi'
 : ${RUN_NIGHTLY:=0}
 export RUN_NIGHTLY
 
-: ${RUN_NIGHTLY_FAILING:=0}
-export RUN_NIGHTLY_FAILING
-
 # Set defaults for missing test config options
 : ${SPDK_AUTOTEST_DEBUG_APPS:=0}; export SPDK_AUTOTEST_DEBUG_APPS
 : ${SPDK_BUILD_PACKAGE=0}; export SPDK_BUILD_PACKAGE