diff --git a/testsuite/expect/inc21.34_tests b/testsuite/expect/inc21.34_tests
index 4bd8c3e8729779f7fe4b1e4d7e8b714d7aa25fde..fee893097bf4af2c11ca07f858f702a09c667386 100644
--- a/testsuite/expect/inc21.34_tests
+++ b/testsuite/expect/inc21.34_tests
@@ -54,7 +54,7 @@ proc part_test { } {
 	global grpcpurunmin_num grpmem_num grpwall_num maxcpumin_num
 	global maxwall_num maxcpuspu_num maxnodespu_num
 	global exit_code part_qos mod_job_qos time_spacing selectparam
-	global nthreads job_qos mod_part_qos
+	global nthreads job_qos mod_part_qos prio_multifactor
 
 	# We will set qostest with the qos that we will test since the some of
 	# the 21.30 inc test require the qostest variable
@@ -207,19 +207,22 @@ proc part_test { } {
 
 	#
 	# Test GroupCPURunMins
+	# Requires priority/multifactor to properly handle decay well
 	#
-	set mod_job_qos(GrpCpuRunMin) 1
-	set mod_part_qos(GrpCpuRunMin) $grpcpurunmin_num
-	mod_qos $part_qos [array get mod_part_qos]
-	mod_qos $job_qos [array get mod_job_qos]
-	sleep $time_spacing
-	inc21_30_10
-	if {$exit_code != 0 } {
-		cleanup
-		exit 1
+	if { $prio_multifactor != 0 } {
+		set mod_job_qos(GrpCpuRunMin) 1
+		set mod_part_qos(GrpCpuRunMin) $grpcpurunmin_num
+		mod_qos $part_qos [array get mod_part_qos]
+		mod_qos $job_qos [array get mod_job_qos]
+		sleep $time_spacing
+		inc21_30_10
+		if {$exit_code != 0 } {
+			cleanup
+			exit 1
+		}
+		set mod_job_qos(GrpCpuRunMin) "-1"
+		set mod_part_qos(GrpCpuRunMin) "-1"
 	}
-	set mod_job_qos(GrpCpuRunMin) "-1"
-	set mod_part_qos(GrpCpuRunMin) "-1"
 
 	#
 	# Test Group Memory
@@ -239,19 +242,22 @@ proc part_test { } {
 
 	#
 	# Test Group wall
+	# Requires priority/multifactor to properly handle decay well
 	#
-	set mod_job_qos(GrpWall) 1
-	set mod_part_qos(GrpWall) $grpwall_num
-	mod_qos $part_qos [array get mod_part_qos]
-	mod_qos $job_qos [array get mod_job_qos]
-	sleep $time_spacing
-	inc21_34_2 $part_qos
-	if {$exit_code != 0 } {
-		cleanup
-		exit 1
+	if { $prio_multifactor != 0 } {
+		set mod_job_qos(GrpWall) 1
+		set mod_part_qos(GrpWall) $grpwall_num
+		mod_qos $part_qos [array get mod_part_qos]
+		mod_qos $job_qos [array get mod_job_qos]
+		sleep $time_spacing
+		inc21_34_2 $part_qos
+		if {$exit_code != 0 } {
+			cleanup
+			exit 1
+		}
+		set mod_job_qos(GrpWall) "-1"
+		set mod_part_qos(GrpWall) "-1"
 	}
-	set mod_job_qos(GrpWall) "-1"
-	set mod_part_qos(GrpWall) "-1"
 
 	#
 	# Test Max Cpu Mins
@@ -355,7 +361,7 @@ proc qos_test { } {
 	global grpcpurunmin_num grpmem_num grpwall_num maxcpumin_num
 	global maxwall_num maxcpuspu_num maxnodespu_num
 	global exit_code job_qos mod_job_qos time_spacing selectparam
-	global nthreads part_qos mod_part_qos
+	global nthreads part_qos mod_part_qos prio_multifactor
 
 	# We will set qostest with the qos that we will test since the some of
 	# the 21.30 inc test require the qostest variable
@@ -508,19 +514,22 @@ proc qos_test { } {
 
 	#
 	# Test GroupCPURunMins
+	# Requires priority/multifactor to properly handle decay well
 	#
-	set mod_job_qos(GrpCpuRunMin) $grpcpurunmin_num
-	set mod_part_qos(GrpCpuRunMin) 1
-	mod_qos $job_qos [array get mod_job_qos]
-	mod_qos $part_qos [array get mod_part_qos]
-	sleep $time_spacing
-	inc21_30_10
-	if {$exit_code != 0 } {
-		cleanup
-		exit 1
+	if { $prio_multifactor != 0 } {
+		set mod_job_qos(GrpCpuRunMin) $grpcpurunmin_num
+		set mod_part_qos(GrpCpuRunMin) 1
+		mod_qos $job_qos [array get mod_job_qos]
+		mod_qos $part_qos [array get mod_part_qos]
+		sleep $time_spacing
+		inc21_30_10
+		if {$exit_code != 0 } {
+			cleanup
+			exit 1
+		}
+		set mod_job_qos(GrpCpuRunMin) "-1"
+		set mod_part_qos(GrpCpuRunMin) "-1"
 	}
-	set mod_job_qos(GrpCpuRunMin) "-1"
-	set mod_part_qos(GrpCpuRunMin) "-1"
 
 	#
 	# Test Group Memory
@@ -540,19 +549,22 @@ proc qos_test { } {
 
 	#
 	# Test Group wall
-	#
-	set mod_job_qos(GrpWall) $grpwall_num
-	set mod_part_qos(GrpWall) 1
-	mod_qos $job_qos [array get mod_job_qos]
-	mod_qos $part_qos [array get mod_part_qos]
-	sleep $time_spacing
-	inc21_34_2 $job_qos
-	if {$exit_code != 0 } {
-		cleanup
-		exit 1
+	# Requires priority/multifactor to properly handle decay well
+	#
+	if { $prio_multifactor != 0 } {
+		set mod_job_qos(GrpWall) $grpwall_num
+		set mod_part_qos(GrpWall) 1
+		mod_qos $job_qos [array get mod_job_qos]
+		mod_qos $part_qos [array get mod_part_qos]
+		sleep $time_spacing
+		inc21_34_2 $job_qos
+		if {$exit_code != 0 } {
+			cleanup
+			exit 1
+		}
+		set mod_job_qos(GrpWall) "-1"
+		set mod_part_qos(GrpWall) "-1"
 	}
-	set mod_job_qos(GrpWall) "-1"
-	set mod_part_qos(GrpWall) "-1"
 
 	#
 	# Test Max Cpu Mins
diff --git a/testsuite/expect/test21.30 b/testsuite/expect/test21.30
index 39be5d91e360760b2a1f7ca463af721576b5dd87..78e5eef0b4696e3abea0b46cb78d6e4a89775ca7 100755
--- a/testsuite/expect/test21.30
+++ b/testsuite/expect/test21.30
@@ -146,12 +146,17 @@ expect {
 		wait
 	}
 }
-
 if {$tmpc == 0 || $tmpn == 0} {
 	send_user "\nWARNING: not enough Nodes and/or CPUs\n"
 	exit 0
 }
 
+if { ![string compare [priority_type] "multifactor"] } {
+	set prio_multifactor 1
+} else {
+	set prio_multifactor 0
+}
+
 # Checks the state of the job
 proc check_state { job } {
 
@@ -554,15 +559,18 @@ set mod_qos_vals(GrpCpuMin) "-1"
 
 #
 # Test GroupCPURunMins
+# Requires priority/multifactor to properly handle decay well
 #
-set mod_qos_vals(GrpCpuRunMin) $grpcpurunmin_num
-mod_qos $qostest [array get mod_qos_vals]
-sleep $time_spacing
-inc21_30_10
-if {$exit_code != 0 } {
-	endit
+if { $prio_multifactor != 0 } {
+	set mod_qos_vals(GrpCpuRunMin) $grpcpurunmin_num
+	mod_qos $qostest [array get mod_qos_vals]
+	sleep $time_spacing
+	inc21_30_10
+	if {$exit_code != 0 } {
+		endit
+	}
+	set mod_qos_vals(GrpCpuRunMin) "-1"
 }
-set mod_qos_vals(GrpCpuRunMin) "-1"
 
 #
 # Test Group Memory
@@ -578,15 +586,18 @@ set mod_qos_vals(GrpMem) "-1"
 
 #
 # Test Group wall
+# Requires priority/multifactor to properly handle decay well
 #
-set mod_qos_vals(GrpWall) $grpwall_num
-mod_qos $qostest [array get mod_qos_vals]
-sleep $time_spacing
-inc21_30_12
-if {$exit_code != 0 } {
-	endit
+if { $prio_multifactor != 0 } {
+	set mod_qos_vals(GrpWall) $grpwall_num
+	mod_qos $qostest [array get mod_qos_vals]
+	sleep $time_spacing
+	inc21_30_12
+	if {$exit_code != 0 } {
+		endit
+	}
+	set mod_qos_vals(GrpWall) "-1"
 }
-set mod_qos_vals(GrpWall) "-1"
 
 #
 # Test Max Cpu Mins
diff --git a/testsuite/expect/test21.34 b/testsuite/expect/test21.34
index 0b9558065798ea509fe57ccd8f6ed966eb991bf9..5ddd0d04a8477da9c75fec38059ae9b5adae8a55 100755
--- a/testsuite/expect/test21.34
+++ b/testsuite/expect/test21.34
@@ -240,6 +240,11 @@ if {[test_super_user] == 0} {
 	send_user "\nWARNING Test can only be ran as SlurmUser\n"
 	exit 0
 }
+if { ![string compare [priority_type] "multifactor"] } {
+	set prio_multifactor 1
+} else {
+	set prio_multifactor 0
+}
 
 # Remove any vestigial data
 cleanup