diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
index 3a98bc33f032e3a024ab7ebc71e9781b4ed207b9..e3f29c71189e75b709aa4e5ae3af745f09a31ac3 100644
--- a/src/plugins/mpi/pmix/mpi_pmix.c
+++ b/src/plugins/mpi/pmix/mpi_pmix.c
@@ -98,7 +98,8 @@ int p_mpi_hook_slurmstepd_prefork(const stepd_step_rec_t *job, char ***env)
 		goto err_ext;
 	}
 	return SLURM_SUCCESS;
-	err_ext:
+
+err_ext:
 	/* Abort the whole job if error! */
 	slurm_kill_job_step(job->jobid, job->stepid, SIGKILL);
 	return ret;
diff --git a/src/plugins/mpi/pmix/pmixp_client.c b/src/plugins/mpi/pmix/pmixp_client.c
index 6f2773fef468cb06d257ee076dc92819dc42eedd..6c04eebe655b7d1ecedc2460431c192bb9d35533 100644
--- a/src/plugins/mpi/pmix/pmixp_client.c
+++ b/src/plugins/mpi/pmix/pmixp_client.c
@@ -611,7 +611,7 @@ pmix_status_t fencenb_fn(const pmix_proc_t procs[], size_t nprocs,
 		goto error;
 	}
 	return PMIX_SUCCESS;
-      error:
+error:
 	cbfunc(status, NULL, 0, cbdata, NULL, NULL);
 	return status;
 }
diff --git a/src/plugins/mpi/pmix/pmixp_coll.c b/src/plugins/mpi/pmix/pmixp_coll.c
index 097d7fcacdae23dc6f2600fa6be98a138d4f0039..16cf1ac27346dbd1325e3f26d97b41fbc24ef234 100644
--- a/src/plugins/mpi/pmix/pmixp_coll.c
+++ b/src/plugins/mpi/pmix/pmixp_coll.c
@@ -72,7 +72,7 @@ static int _hostset_from_ranges(const pmix_proc_t *procs, size_t nprocs,
 	hostlist_uniq(hl);
 	*hl_out = hl;
 	return SLURM_SUCCESS;
-      err_exit:
+err_exit:
 	hostlist_destroy(hl);
 	return SLURM_ERROR;
 }
@@ -290,7 +290,7 @@ int pmixp_coll_init(pmixp_coll_t *coll, const pmix_proc_t *procs,
 	pthread_mutexattr_destroy(&attr);
 
 	return SLURM_SUCCESS;
-      err_exit:
+err_exit:
 	return SLURM_ERROR;
 }
 
@@ -406,7 +406,7 @@ int pmixp_coll_contrib_node(pmixp_coll_t *coll, char *nodename, Buf buf)
 	/* increase number of total contributions */
 	coll->contrib_cntr++;
 
-	proceed:
+proceed:
 	/* unlock the structure */
 	pthread_mutex_unlock(&coll->lock);
 
@@ -544,7 +544,7 @@ static void _progress_fan_in(pmixp_coll_t *coll)
 		set_buf_offset(coll->buf, 0);
 	}
 
-      unlock:
+unlock:
 	if (NULL != hostlist) {
 		xfree(hostlist);
 	}
@@ -595,7 +595,7 @@ void pmixp_coll_reset_if_to(pmixp_coll_t *coll, time_t ts)
 		/* report the timeout event */
 		PMIXP_ERROR("Collective timeout!");
 	}
-	unlock:
+unlock:
 	/* unlock the structure */
 	pthread_mutex_unlock(&coll->lock);
 }
diff --git a/src/plugins/mpi/pmix/pmixp_dmdx.c b/src/plugins/mpi/pmix/pmixp_dmdx.c
index 21845cf9411ed8bb69913faaddebfa907a4727a4..d796480b1a49aac4be144265a7c9934ee28556e1 100644
--- a/src/plugins/mpi/pmix/pmixp_dmdx.c
+++ b/src/plugins/mpi/pmix/pmixp_dmdx.c
@@ -355,7 +355,7 @@ static void _dmdx_req(Buf buf, char *sender_host, uint32_t seq_num)
 				caddy->sender_ns, rc);
 		_dmdx_free_caddy(caddy);
 	}
-	exit:
+exit:
 	/* we don't need this buffer anymore */
 	free_buf(buf);
 
@@ -418,7 +418,7 @@ static void _dmdx_resp(Buf buf, char *sender_host, uint32_t seq_num)
 	req = NULL;
 	list_delete_item(it);
 	list_iterator_destroy(it);
-      exit:
+exit:
 	if (SLURM_SUCCESS != rc) {
 		/* we are not expect libpmix to call the callback
 		 * to cleanup this buffer */
diff --git a/src/plugins/mpi/pmix/pmixp_info.c b/src/plugins/mpi/pmix/pmixp_info.c
index 4729dc61c1d4094ebc5971173e81c0d35dc86e8f..a260d21656a8c050f9cc32306e00c5a22daae252 100644
--- a/src/plugins/mpi/pmix/pmixp_info.c
+++ b/src/plugins/mpi/pmix/pmixp_info.c
@@ -268,7 +268,7 @@ static int _resources_set(char ***env)
 	_pmixp_job_info.task_map_packed = xstrdup(p);
 
 	return SLURM_SUCCESS;
-      err_exit:
+err_exit:
 	hostlist_destroy(_pmixp_job_info.job_hl);
 	hostlist_destroy(_pmixp_job_info.step_hl);
 	if (NULL != _pmixp_job_info.hostname) {
diff --git a/src/plugins/mpi/pmix/pmixp_nspaces.c b/src/plugins/mpi/pmix/pmixp_nspaces.c
index 1f3c83fbea470a69714524f70b1aae830cd9c378..32c09a80d5d3ca88c4c89ae4dfa4d9a3b872ee3d 100644
--- a/src/plugins/mpi/pmix/pmixp_nspaces.c
+++ b/src/plugins/mpi/pmix/pmixp_nspaces.c
@@ -135,7 +135,7 @@ pmixp_namespace_t *pmixp_nspaces_find(const char *name)
 	}
 	/* Didn't found one! */
 	nsptr = NULL;
-      exit:
+exit:
 	return nsptr;
 }
 
diff --git a/src/plugins/mpi/pmix/pmixp_server.c b/src/plugins/mpi/pmix/pmixp_server.c
index 3b91fec4a6498d887c9d640f33b4855d12be8ce5..ead8cff492529a1ec9ee7e165b4e1c06b4c2e480 100644
--- a/src/plugins/mpi/pmix/pmixp_server.c
+++ b/src/plugins/mpi/pmix/pmixp_server.c
@@ -150,17 +150,17 @@ int pmixp_stepd_init(const stepd_step_rec_t *job, char ***env)
 	_was_initialized = 1;
 	return SLURM_SUCCESS;
 
-      err_job:
+err_job:
 	pmixp_libpmix_finalize();
-      err_lib:
+err_lib:
 	pmixp_dmdx_finalize();
-      err_dmdx:
+err_dmdx:
 	pmixp_state_finalize();
-      err_state:
+err_state:
 	pmixp_nspaces_finalize();
-	err_usock:
+err_usock:
 	xfree(path);
-      err_path:
+err_path:
 	pmixp_info_free();
 	return rc;
 }
diff --git a/src/plugins/mpi/pmix/pmixp_state.c b/src/plugins/mpi/pmix/pmixp_state.c
index b9f7a70c3c1516aa7a24f74536725b3f846f527b..a186306f4864d86858f786e8bc32e883091f6d01 100644
--- a/src/plugins/mpi/pmix/pmixp_state.c
+++ b/src/plugins/mpi/pmix/pmixp_state.c
@@ -113,7 +113,7 @@ static pmixp_coll_t *_find_collective(pmixp_coll_type_t type,
 			goto exit;
 		}
 	}
-      exit:
+exit:
 	list_iterator_destroy(it);
 	return ret;
 }
diff --git a/src/plugins/mpi/pmix/pmixp_utils.c b/src/plugins/mpi/pmix/pmixp_utils.c
index 8d4229b1b44f6ab02d7028b079492fd204da34aa..ec971a5406480a6227d0dcc92c1ca3384a014179 100644
--- a/src/plugins/mpi/pmix/pmixp_utils.c
+++ b/src/plugins/mpi/pmix/pmixp_utils.c
@@ -98,9 +98,9 @@ int pmixp_usock_create_srv(char *path)
 	}
 	return fd;
 
-      err_bind:
+err_bind:
 	unlink(path);
-      err_fd:
+err_fd:
 	close(fd);
 	return ret;
 }