diff --git a/autopackage.sh b/autopackage.sh
index d14a63d07..5dc1cce17 100755
--- a/autopackage.sh
+++ b/autopackage.sh
@@ -74,12 +74,13 @@ function build_rpms() (
 	builddir=$SPDK_TEST_STORAGE/test-rpm
 
 	run_test "build_shared_rpm" build_rpm --with-shared
-	run_test "build_shared_rpm_with_rpmed_dpdk" build_rpm_with_rpmed_dpdk
-	run_test "build_rpm_from_gen_spec" build_rpm_from_gen_spec
-
-	if [[ -n $SPDK_TEST_NATIVE_DPDK ]]; then
-		version="test_shared_native_dpdk"
-		run_test "build_shared_native_dpdk_rpm" build_rpm --with-shared --with-dpdk="$SPDK_RUN_EXTERNAL_DPDK"
+	if [[ $RUN_NIGHTLY -eq 1 ]]; then
+		run_test "build_shared_rpm_with_rpmed_dpdk" build_rpm_with_rpmed_dpdk
+		run_test "build_rpm_from_gen_spec" build_rpm_from_gen_spec
+		if [[ -n $SPDK_TEST_NATIVE_DPDK ]]; then
+			version="test_shared_native_dpdk"
+			run_test "build_shared_native_dpdk_rpm" build_rpm --with-shared --with-dpdk="$SPDK_RUN_EXTERNAL_DPDK"
+		fi
 	fi
 )
 
diff --git a/test/common/skipped_tests.txt b/test/common/skipped_tests.txt
index f05aa8e19..00beee5c6 100644
--- a/test/common/skipped_tests.txt
+++ b/test/common/skipped_tests.txt
@@ -53,7 +53,9 @@ bdev_fio_rw_verify_ext
 bdev_fio_trim_ext
 bdev_reset
 build_native_dpdk
+build_rpm_from_gen_spec
 build_shared_native_dpdk_rpm
+build_shared_rpm_with_rpmed_dpdk
 iscsi_tgt_digest
 iscsi_tgt_data_digest
 iscsi_tgt_pmem