diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 9312b173079710c8ed223d3969857aaa908f1076..c1a93bb350c2c72699fdf24ec2354091395767b6 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -988,7 +988,7 @@ char *slurm_get_state_save_location(void)
  * returns the TmpFS configuration parameter from slurmctld_conf object
  * RET char *    - tmp_fs, MUST be xfreed by caller
  */
-extern char *slurm_get_tmp_fs(void)
+extern char *slurm_get_tmp_fs(char *node_name)
 {
 	char *tmp_fs = NULL;
 	slurm_ctl_conf_t *conf = NULL;
@@ -996,7 +996,11 @@ extern char *slurm_get_tmp_fs(void)
 	if (slurmdbd_conf) {
 	} else {
 		conf = slurm_conf_lock();
-		tmp_fs = xstrdup(conf->tmp_fs);
+		if (!node_name)
+			tmp_fs = xstrdup(conf->tmp_fs);
+		else
+			tmp_fs = slurm_conf_expand_slurmd_path(
+				conf->tmp_fs, node_name);
 		slurm_conf_unlock();
 	}
 	return tmp_fs;
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index cafa4775554a95ddd52961d6256e6026d060f1a3..93948cc2151462793ed9c8358ee86eba57c8f5d0 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -408,7 +408,7 @@ char *slurm_get_state_save_location(void);
  * returns the TmpFS configuration parameter from slurmctld_conf object
  * RET char *    - tmp_fs, MUST be xfreed by caller
  */
-extern char *slurm_get_tmp_fs(void);
+extern char *slurm_get_tmp_fs(char *node_name);
 
 /* slurm_get_auth_type
  * returns the authentication type from slurmctld_conf object
diff --git a/src/plugins/mpi/pmix/pmixp_info.c b/src/plugins/mpi/pmix/pmixp_info.c
index a23a2b183cc490c59f2250fe34736b01dae9fe3a..f17290b9cbae66c8c7a396bd4d02da3a8bb9ef58 100644
--- a/src/plugins/mpi/pmix/pmixp_info.c
+++ b/src/plugins/mpi/pmix/pmixp_info.c
@@ -305,7 +305,8 @@ static int _env_set(char ***env)
 	if (p)
 		_pmixp_job_info.cli_tmpdir_base = xstrdup(p);
 	else
-		_pmixp_job_info.cli_tmpdir_base = slurm_get_tmp_fs();
+		_pmixp_job_info.cli_tmpdir_base = slurm_get_tmp_fs(
+			_pmixp_job_info.hostname);
 
 	_pmixp_job_info.cli_tmpdir =
 		xstrdup_printf("%s/spmix_appdir_%d.%d",