diff --git a/testsuite/expect/test1.29.prog.c b/testsuite/expect/test1.29.prog.c
index 7f967a59c75950b65fed1306efc757605db8d54a..d994f0b822e1f0aeb5fc4c99b8ca703c04e2d8ed 100644
--- a/testsuite/expect/test1.29.prog.c
+++ b/testsuite/expect/test1.29.prog.c
@@ -32,7 +32,7 @@
 #include <sys/resource.h>
 #include <unistd.h>
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	struct rlimit u_limit;
 	int exit_code = 0;
diff --git a/testsuite/expect/test1.32.prog.c b/testsuite/expect/test1.32.prog.c
index 3e824f6687dc661dba548c71a6fe2c4b382d4c03..e376fd95b9b755609e7e840a2a99088b4a6ede78 100644
--- a/testsuite/expect/test1.32.prog.c
+++ b/testsuite/expect/test1.32.prog.c
@@ -55,7 +55,7 @@ void sig_handler(int sig)
 	}
 }
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	struct sigaction act;
 
diff --git a/testsuite/expect/test1.34.prog.c b/testsuite/expect/test1.34.prog.c
index ee795cb794d53eb6aed18af1d42f4cd8b50d3753..5473ba356ecfcfc8df483cf7ac1d875fdef49698 100644
--- a/testsuite/expect/test1.34.prog.c
+++ b/testsuite/expect/test1.34.prog.c
@@ -41,5 +41,5 @@ int main (int argc, char *argv[])
 	fflush(stdout);
 	buffer = (char *) 0;
 	buffer[1] = 'a';
-	return;
+	return 0;
 }
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index 90921df9c75cf39ab7e8e4c16e4373d347ff6b57..0898bd9bbf7247ce1dfe27f4641564d737d0a4b3 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -68,7 +68,7 @@ puts $fd {
 #include <stdlib.h>
 #include <unistd.h>
 
-main()
+int main()
 {
     char *id = getenv("SLURM_PROCID");
     if (atoi(id) == 9) {
diff --git a/testsuite/expect/test1.89.prog.c b/testsuite/expect/test1.89.prog.c
index 79b17f4d8f6bfe16b8e8499f1c842d44b700a72c..52682cf2b42de3be6191b651c06883dcf96eded4 100644
--- a/testsuite/expect/test1.89.prog.c
+++ b/testsuite/expect/test1.89.prog.c
@@ -66,7 +66,7 @@ static uint64_t _mask_to_int(cpu_set_t *mask)
 }
 
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	char *task_str;
 	cpu_set_t mask;
diff --git a/testsuite/expect/test1.90.prog.c b/testsuite/expect/test1.90.prog.c
index 9bd40608a98b5ebfbfdc2510051f65cf8495d1e7..27a63fd9ac4430831a217d018278997a66b102f1 100644
--- a/testsuite/expect/test1.90.prog.c
+++ b/testsuite/expect/test1.90.prog.c
@@ -69,7 +69,7 @@ static unsigned long _mask_to_int(MY_MASK *mask)
 	return rc;
 }
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	char *task_str;
 	MY_MASK cpu_mask;
diff --git a/testsuite/expect/test1.91.prog.c b/testsuite/expect/test1.91.prog.c
index cf154f2b8bdfe131d8c393c86309f9eb5000b77a..7c4182e6f3af7eb11e330dd34c03823f7ffa6593 100644
--- a/testsuite/expect/test1.91.prog.c
+++ b/testsuite/expect/test1.91.prog.c
@@ -66,7 +66,7 @@ static uint64_t _mask_to_int(cpu_set_t *mask)
 	return rc;
 }
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	char *task_str;
 	cpu_set_t mask;
diff --git a/testsuite/expect/test16.4.prog.c b/testsuite/expect/test16.4.prog.c
index cc9ef53b8b47bf0bd8f8b5cae99482adb2737b36..ed64dc41e541881fe0ff2d559367b7cc2656401c 100644
--- a/testsuite/expect/test16.4.prog.c
+++ b/testsuite/expect/test16.4.prog.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <unistd.h>
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	char in_line[10];
 	int i;
diff --git a/testsuite/expect/test17.15.prog.c b/testsuite/expect/test17.15.prog.c
index 7f967a59c75950b65fed1306efc757605db8d54a..d994f0b822e1f0aeb5fc4c99b8ca703c04e2d8ed 100644
--- a/testsuite/expect/test17.15.prog.c
+++ b/testsuite/expect/test17.15.prog.c
@@ -32,7 +32,7 @@
 #include <sys/resource.h>
 #include <unistd.h>
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	struct rlimit u_limit;
 	int exit_code = 0;
diff --git a/testsuite/expect/test33.1.prog.c b/testsuite/expect/test33.1.prog.c
index 88deaa8dec1e8a773e069d12a7c8c1998fa59455..1f81a3ece3a66a60d78df07579c6c94be8260a87 100644
--- a/testsuite/expect/test33.1.prog.c
+++ b/testsuite/expect/test33.1.prog.c
@@ -347,6 +347,6 @@ int main(int argc, char *argv[])
 
 ouch:
 	_free_options();
-	return;
+	return 0;
 
 }
diff --git a/testsuite/expect/test6.13.prog.c b/testsuite/expect/test6.13.prog.c
index eb6317cdd31d3138aff86b70e4adb60e0c76d9f6..525de59e4423dff8ee8bfc6d34a3640b0d145cf5 100644
--- a/testsuite/expect/test6.13.prog.c
+++ b/testsuite/expect/test6.13.prog.c
@@ -30,7 +30,7 @@ void sig_handler(int sig)
 	}
 }
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	struct sigaction act;
 	time_t begin_time = time(NULL);
diff --git a/testsuite/expect/test6.7.prog.c b/testsuite/expect/test6.7.prog.c
index e085fb8db47d1e7bd809e5cf585fb54247d0f1d4..8a0a0ff42e480093a0285083498a4e86cc9627d8 100644
--- a/testsuite/expect/test6.7.prog.c
+++ b/testsuite/expect/test6.7.prog.c
@@ -30,7 +30,7 @@ void sig_handler(int sig)
 	}
 }
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	struct sigaction act;
 	time_t begin_time = time(NULL);
diff --git a/testsuite/expect/test7.11.prog.c b/testsuite/expect/test7.11.prog.c
index eeb5a0577796ef59c8caa1069e3b49a3c7cb6406..79dca22940cc24c3f0f2afe6cd42c75bbe536442 100644
--- a/testsuite/expect/test7.11.prog.c
+++ b/testsuite/expect/test7.11.prog.c
@@ -113,7 +113,7 @@ int slurm_spank_init(spank_t sp, int ac, char **av)
 int slurm_spank_init_post_opt(spank_t sp, int ac, char **av) */
 
 /* Called from srun only */
-slurm_spank_local_user_init(spank_t sp, int ac, char **av)
+int slurm_spank_local_user_init(spank_t sp, int ac, char **av)
 {
 	slurm_info("slurm_spank_local_user_init");
 
diff --git a/testsuite/expect/test7.12.prog.c b/testsuite/expect/test7.12.prog.c
index f88e4b37cb1de746a41571f533438563c777f1e3..ca5d53b8e4392abad458581e8265f2215c4e52ec 100644
--- a/testsuite/expect/test7.12.prog.c
+++ b/testsuite/expect/test7.12.prog.c
@@ -30,7 +30,7 @@
 #include <slurm/slurm.h>
 #include <slurm/slurm_errno.h>
 
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
 	int i, rc = 0;
 	uint32_t job_id = 0, step_id = 0;
diff --git a/testsuite/expect/test7.2.prog.c b/testsuite/expect/test7.2.prog.c
index bf1fe858c98e076a42075bc8f8b60031b9ea5938..1a19f9a6b3554150b4edf3b80f26dfb262c5a63a 100644
--- a/testsuite/expect/test7.2.prog.c
+++ b/testsuite/expect/test7.2.prog.c
@@ -47,7 +47,7 @@
 #define OFFSET_1  1234
 #define OFFSET_2  5678
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	int i, j, rc;
 	int nprocs, procid;
diff --git a/testsuite/expect/test7.5.prog.c b/testsuite/expect/test7.5.prog.c
index 621172dd49a4c2324ad5dd320537c298baba9762..3b6d1a8786e7bf5e666e1ef816ada2a329a97d0a 100644
--- a/testsuite/expect/test7.5.prog.c
+++ b/testsuite/expect/test7.5.prog.c
@@ -51,7 +51,7 @@ void sig_handler(int sig)
 	}
 }
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	struct sigaction act;
 
diff --git a/testsuite/expect/test7.9.prog.c b/testsuite/expect/test7.9.prog.c
index dafbbf65f092435f0db7197c1fd62b74fc767b1a..f9def25f0eaf102bbe55a71b85c5c66059ea8b10 100644
--- a/testsuite/expect/test7.9.prog.c
+++ b/testsuite/expect/test7.9.prog.c
@@ -36,7 +36,7 @@
 #define _DEBUG         0
 #define _EXTREME_DEBUG 0
 
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
 	int i;
 	struct stat buf;