diff --git a/NEWS b/NEWS
index cf389b1f670e0221a616cbc3f46784e6646bede0..2ea2681e575cefc72fbc1c9ea17626eb8c2730bd 100644
--- a/NEWS
+++ b/NEWS
@@ -82,6 +82,9 @@ documents those changes that are of interest to users and administrators.
  -- Fix job array dependency with "aftercorr" option and some task arrays in
     the first job fail. This fix lets all task array elements that can run
     proceed rather than stopping all subsequent task array elements.
+ -- Fix output file containing "%t" (task ID) for heterogeneous job step to
+    be based upon global task ID rather than task ID for that component of the
+    heterogeneous job step.
 
 * Changes in Slurm 17.11.2
 ==========================
diff --git a/src/slurmd/common/fname.c b/src/slurmd/common/fname.c
index 29127f605395a49f2397de347ea27a6a0e9baaf8..4cf1727370e9440c81678ba09339882275ef907a 100644
--- a/src/slurmd/common/fname.c
+++ b/src/slurmd/common/fname.c
@@ -261,6 +261,8 @@ static void _step_path_check(char **p, char **q, char **name, unsigned int wid,
 	case 't':  /* '%t' => taskid         */
 		xmemcat(*name, *q, *p - offset);
 		if (!double_p) {
+			if (job->pack_task_offset != NO_VAL)
+				taskid += job->pack_task_offset;
 			xstrfmtcat(*name, "%0*u", wid, taskid);
 			(*p)++;
 		}
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 9757deb3c558e5d7e49b9d448529bd93b95e25ce..ae775093bf7cd814fc5c2ba350532016fad52fd5 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -1987,6 +1987,13 @@ proc test_node_features_plugin { } {
 			set type $expect_out(1,string)
 			exp_continue
 		}
+		-re "null" {
+			exp_continue
+		}
+		-re "($alpha_numeric_under)" {
+			set type $expect_out(1,string)
+			exp_continue
+		}
 		eof {
 			wait
 		}
diff --git a/testsuite/expect/inc3.11.9 b/testsuite/expect/inc3.11.9
index 3b8468ac63548094f3e95ad4b5ced019f651fff9..4af4cd52de1b52659e092b340e974db3d4b9610b 100644
--- a/testsuite/expect/inc3.11.9
+++ b/testsuite/expect/inc3.11.9
@@ -36,6 +36,17 @@ proc inc3_11_9 {} {
 
 	send_user "\n+++++ STARTING TEST 9 (Within: inc3.11.9) +++++\n"
 
+#	Assumes nodes have sequential suffix numbers
+	set min_node_inx $def_node_inx_min
+	set max_node_inx [expr $def_node_inx_min + 4]
+	set min_len [string length $min_node_inx]
+	set max_len [string length $max_node_inx]
+	if {$min_len > $max_len} {
+#		Preserve leading zeros
+#		(e.g. "nid[00001-00005]" rather than "nid[00001-5]")
+		set max_node_inx [format %${min_len}.${min_len}d $max_node_inx]
+	}
+
 	# Make the job script
 	exec $bin_rm -f $file_in
 	make_bash_script $file_in "$bin_sleep 100"
@@ -104,8 +115,7 @@ proc inc3_11_9 {} {
 		cancel_job $job_id
 		return
 	}
-	set min_node_inx $def_node_inx_min
-	set max_node_inx [expr $def_node_inx_min + 4]
+
 	set ret_code [create_res "StartTime=now Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,1 User=$user_name" 0]
 	if {$ret_code != 0} {
 		send_user "\n\033\[31mFAILURE: Unable to create a valid reservation (Within: inc3.11.9)\033\[m\n"
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 4649f88fb9183f9285d1ba9e1d4df1f220ab6d42..7c1f20dbe5dec542422fb7420fa54e4c151e3ab4 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -106,11 +106,11 @@ make_bash_script $file_in "
 
   $bin_date
   $bin_echo test3_n4_cyclic
-  $srun -n4 --distribution=cyclic ./$test_prog
+  $srun -n4 -N1-4 --distribution=cyclic ./$test_prog
 
   $bin_date
   $bin_echo test4_n4_block
-  $srun -n4 --distribution=block  ./$test_prog
+  $srun -n4 -N1-4 --distribution=block  ./$test_prog
 
   $bin_date
   $bin_echo TEST_COMPLETE
diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
index 90b6a77fdd12beddd4af0b5fe555501a8f6b0d85..73e828fe4743a1c4f69f8eccaaa29e8dcfae8b15 100755
--- a/testsuite/expect/test17.12
+++ b/testsuite/expect/test17.12
@@ -554,7 +554,7 @@ proc sub_job_xor {nnode fail_test} {
 proc set_node_feature {node_name new_feature} {
 	global scontrol exit_code
 
-	spawn $scontrol update node=$node_name ActiveFeatures=$new_feature AvailableFeatures=$new_feature
+	spawn $scontrol update node=$node_name AvailableFeatures=$new_feature ActiveFeatures=$new_feature
 	expect {
 		timeout {
 			send_user "\nFAILURE: scontrol is not responding\n"
@@ -583,7 +583,7 @@ proc clean_up {} {
 	# Reset nodes back to normal
 	foreach option [array names nodes] {
 		set node $nodes($option)
-		spawn $scontrol update node=$node ActiveFeatures=$def_active_node_feat($node) AvailableFeatures=$def_avail_node_feat($node)
+		spawn $scontrol update node=$node AvailableFeatures=$def_avail_node_feat($node) ActiveFeatures=$def_active_node_feat($node)
 		expect {
 			timeout {
 				send_user "\nFAILURE: scontrol is not responding\n"
@@ -645,7 +645,9 @@ if {[test_super_user] == 0 || [string compare [test_node_features_plugin] ""]} {
 	exit $exit_code
 }
 
+#
 # Run job to get available nodes
+#
 log_user 0
 set job_id 0
 set srun_pid [spawn $srun -N1-4 -t1 -l printenv SLURM_JOB_ID]