diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index ab47e93afae2ac4782acd2df2a2a4f6b0234c004..d734e30de5e20df5ee8242d4d92cae65e52ef7f9 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -1301,8 +1301,10 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
 			if (switches_node_cnt[j] == 0)
 				continue;
 			first = bit_ffs(switches_bitmap[j]);
+			if (first < 0)
+				continue;
 			last  = bit_fls(switches_bitmap[j]);
-			for (i=first; ((i<=last) && (first>=0)); i++) {
+			for (i=first; i<=last; i++) {
 				if (!bit_test(switches_bitmap[j], i))
 					continue;
 				if (!bit_test(avail_nodes_bitmap, i)) {
@@ -1321,8 +1323,10 @@ static int _eval_nodes_topo(struct job_record *job_ptr, bitstr_t *bitmap,
 		/* No specific required nodes, calculate CPU counts */
 		for (j=0; j<switch_record_cnt; j++) {
 			first = bit_ffs(switches_bitmap[j]);
+			if (first < 0)
+				continue;
 			last  = bit_fls(switches_bitmap[j]);
-			for (i=first; ((i<=last) && (first>=0)); i++) {
+			for (i=first; i<=last; i++) {
 				if (!bit_test(switches_bitmap[j], i))
 					continue;
 				switches_cpu_cnt[j] += 
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index 0e99e95fc13611ac1c30367a26195edb5ba5c140..d0ff7c65c10f9d3642a2420e50c7b6097ad8c0f4 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -1228,8 +1228,10 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
 			if (switches_node_cnt[j] == 0)
 				continue;
 			first = bit_ffs(switches_bitmap[j]);
+			if (first < 0)
+				continue;
 			last  = bit_fls(switches_bitmap[j]);
-			for (i=first; ((i<=last) && (first>=0)); i++) {
+			for (i=first; i<=last; i++) {
 				if (!bit_test(switches_bitmap[j], i))
 					continue;
 				if (!bit_test(avail_nodes_bitmap, i)) {
@@ -1246,8 +1248,10 @@ static int _job_test_topo(struct job_record *job_ptr, bitstr_t *bitmap,
 		/* No specific required nodes, calculate CPU counts */
 		for (j=0; j<switch_record_cnt; j++) {
 			first = bit_ffs(switches_bitmap[j]);
+			if (first < 0)
+				continue;
 			last  = bit_fls(switches_bitmap[j]);
-			for (i=first; ((i<=last) && (first>=0)); i++) {
+			for (i=first; i<=last; i++) {
 				if (!bit_test(switches_bitmap[j], i))
 					continue;
 				switches_cpu_cnt[j] +=