diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index ea08eb777166115c0fa76b6bd9c527ad388a2963..5ed2ddb531b8e67b9ee2926e0bc7d675659b6139 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -587,7 +587,6 @@ static void _set_submit_dir_env(void)
 /* Returns 0 on success, -1 on failure */
 static int _fill_job_desc_from_opts(job_desc_msg_t *desc)
 {
-	int i;
 #ifdef HAVE_REAL_CRAY
 	uint64_t pagg_id = job_getjid(getpid());
 	/*
@@ -673,7 +672,8 @@ static int _fill_job_desc_from_opts(job_desc_msg_t *desc)
 		desc->priority     = 0;
 #ifdef HAVE_BG
 	if (opt.geometry[0] > 0) {
-		for (i=0; i<SYSTEM_DIMENSIONS; i++)
+		int i;
+		for (i = 0; i < SYSTEM_DIMENSIONS; i++)
 			desc->geometry[i] = opt.geometry[i];
 	}
 #endif
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index 660d7891dfa2396095c8b3100dd809c1d2bf33af..a94603a2b299ed19bf8319ec767b4b86e106fbcb 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -546,7 +546,6 @@ job_desc_msg_create_from_opts (void)
 {
 	job_desc_msg_t *j = xmalloc(sizeof(*j));
 	hostlist_t hl = NULL;
-	int i;
 
 	slurm_init_job_desc_msg(j);
 
@@ -649,7 +648,8 @@ job_desc_msg_create_from_opts (void)
 		j->job_id	= opt.jobid;
 #ifdef HAVE_BG
 	if (opt.geometry[0] > 0) {
-		for (i=0; i<SYSTEM_DIMENSIONS; i++)
+		int i;
+		for (i = 0; i < SYSTEM_DIMENSIONS; i++)
 			j->geometry[i] = opt.geometry[i];
 	}
 #endif