diff --git a/scripts/autotest_common.sh b/scripts/autotest_common.sh
index 34e64d7cf..f89eb0bdc 100755
--- a/scripts/autotest_common.sh
+++ b/scripts/autotest_common.sh
@@ -1,6 +1,8 @@
 set -xe
 ulimit -c unlimited
 
+export RUN_NIGHTLY=0
+
 MAKECONFIG='CONFIG_DEBUG=y CONFIG_WERROR=y'
 
 case `uname` in
diff --git a/test/lib/nvme/nvme.sh b/test/lib/nvme/nvme.sh
index 16f800f09..49577cb22 100755
--- a/test/lib/nvme/nvme.sh
+++ b/test/lib/nvme/nvme.sh
@@ -16,9 +16,11 @@ $valgrind $testdir/unit/nvme_ctrlr_c/nvme_ctrlr_ut
 $valgrind $testdir/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut
 timing_exit unit
 
-timing_enter aer
-$testdir/aer/aer
-timing_exit aer
+if [ $RUN_NIGHTLY -eq 1 ]; then
+	timing_enter aer
+	$testdir/aer/aer
+	timing_exit aer
+fi
 
 timing_enter identify
 $rootdir/examples/nvme/identify/identify