diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index f896ed7..85ab8c4 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -88,13 +88,13 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
     if (image_size < 0) {
         fprintf(stderr, "qemu: could not load kernel '%s'\n",
                 li->image_filename);
-        exit(1);
+        exit(EXIT_FAILURE);
     }
 
     if (li->cmdline && (kcmdline_len = strlen(li->cmdline))) {
         if (kcmdline_len > 256) {
             fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
-            exit(1);
+            exit(EXIT_FAILURE);
         }
         pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline);
     }
diff --git a/tests/tcg/cris/check_gcctorture_pr28634-1.c b/tests/tcg/cris/check_gcctorture_pr28634-1.c
index 45ecd15..ebe3f6f 100644
--- a/tests/tcg/cris/check_gcctorture_pr28634-1.c
+++ b/tests/tcg/cris/check_gcctorture_pr28634-1.c
@@ -11,5 +11,5 @@ main (void)
     y += x;
   if (y != x + 1)
     abort ();
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_gcctorture_pr28634.c b/tests/tcg/cris/check_gcctorture_pr28634.c
index a0c5254..52e5ef3 100644
--- a/tests/tcg/cris/check_gcctorture_pr28634.c
+++ b/tests/tcg/cris/check_gcctorture_pr28634.c
@@ -11,5 +11,5 @@ main (void)
     y += x;
   if (y != x + 1)
     abort ();
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_glibc_kernelversion.c b/tests/tcg/cris/check_glibc_kernelversion.c
index 0744872..ebc4959 100644
--- a/tests/tcg/cris/check_glibc_kernelversion.c
+++ b/tests/tcg/cris/check_glibc_kernelversion.c
@@ -112,5 +112,5 @@ int main(void)
 	if (version < __LINUX_KERNEL_VERSION)
 		err();
 	pass();
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_hello.c b/tests/tcg/cris/check_hello.c
index fb403ba..14b6fff 100644
--- a/tests/tcg/cris/check_hello.c
+++ b/tests/tcg/cris/check_hello.c
@@ -3,5 +3,5 @@
 int main ()
 {
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_lz.c b/tests/tcg/cris/check_lz.c
index 69c2e6d..603aeac 100644
--- a/tests/tcg/cris/check_lz.c
+++ b/tests/tcg/cris/check_lz.c
@@ -45,5 +45,5 @@ int main(void)
 {
 	check_lz();
 	pass();
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_mapbrk.c b/tests/tcg/cris/check_mapbrk.c
index 1aff762..8d5ec3f 100644
--- a/tests/tcg/cris/check_mapbrk.c
+++ b/tests/tcg/cris/check_mapbrk.c
@@ -16,7 +16,7 @@ int main ()
       || (p6 = malloc (8191*1024)) == NULL)
   {
     printf ("fail\n");
-    exit (1);
+    exit(EXIT_FAILURE);
   }
 
   free (p1);
@@ -30,10 +30,10 @@ int main ()
   if (p1 == NULL)
   {
     printf ("fail\n");
-    exit (1);
+    exit(EXIT_FAILURE);
   }
   free (p1);
 
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_mmap1.c b/tests/tcg/cris/check_mmap1.c
index b803f0c..12a7fb5 100644
--- a/tests/tcg/cris/check_mmap1.c
+++ b/tests/tcg/cris/check_mmap1.c
@@ -44,5 +44,5 @@ int main (int argc, char *argv[])
     abort ();
 
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_mmap2.c b/tests/tcg/cris/check_mmap2.c
index 35139a0..6c04db3 100644
--- a/tests/tcg/cris/check_mmap2.c
+++ b/tests/tcg/cris/check_mmap2.c
@@ -44,5 +44,5 @@ int main (int argc, char *argv[])
     abort ();
 
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_mmap3.c b/tests/tcg/cris/check_mmap3.c
index 34401fa..9430177 100644
--- a/tests/tcg/cris/check_mmap3.c
+++ b/tests/tcg/cris/check_mmap3.c
@@ -29,5 +29,5 @@ int main (int argc, char *argv[])
     abort ();
 
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_openpf5.c b/tests/tcg/cris/check_openpf5.c
index 1f86ea2..29c9ad3 100644
--- a/tests/tcg/cris/check_openpf5.c
+++ b/tests/tcg/cris/check_openpf5.c
@@ -52,5 +52,5 @@ int main (int argc, char *argv[])
 
 ok:
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_stat1.c b/tests/tcg/cris/check_stat1.c
index 2e2cae5..bf17527 100644
--- a/tests/tcg/cris/check_stat1.c
+++ b/tests/tcg/cris/check_stat1.c
@@ -12,5 +12,5 @@ int main (void)
       || !S_ISDIR (buf.st_mode))
     abort ();
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_stat2.c b/tests/tcg/cris/check_stat2.c
index e36172e..e9ca81a 100644
--- a/tests/tcg/cris/check_stat2.c
+++ b/tests/tcg/cris/check_stat2.c
@@ -16,5 +16,5 @@ int main (void)
       || !S_ISDIR (buf.st_mode))
     abort ();
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_stat3.c b/tests/tcg/cris/check_stat3.c
index 36a9d5d..3696f0d 100644
--- a/tests/tcg/cris/check_stat3.c
+++ b/tests/tcg/cris/check_stat3.c
@@ -21,5 +21,5 @@ int main (int argc, char *argv[])
       || !S_ISREG (buf.st_mode))
     abort ();
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_stat4.c b/tests/tcg/cris/check_stat4.c
index 04f21fe..bc28b98 100644
--- a/tests/tcg/cris/check_stat4.c
+++ b/tests/tcg/cris/check_stat4.c
@@ -23,5 +23,5 @@ int main (int argc, char *argv[])
       || !S_ISREG (buf.st_mode))
     abort ();
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_time1.c b/tests/tcg/cris/check_time1.c
index 3fcf0e1..92c00a3 100644
--- a/tests/tcg/cris/check_time1.c
+++ b/tests/tcg/cris/check_time1.c
@@ -42,5 +42,5 @@ main (void)
     }
 
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/check_time2.c b/tests/tcg/cris/check_time2.c
index 20b69b4..9960866 100644
--- a/tests/tcg/cris/check_time2.c
+++ b/tests/tcg/cris/check_time2.c
@@ -14,5 +14,5 @@ main (void)
   if (t == (time_t) -1 || t != x)
     abort ();
   printf ("pass\n");
-  exit (0);
+  exit(EXIT_SUCCESS);
 }
diff --git a/tests/tcg/cris/sys.c b/tests/tcg/cris/sys.c
index 551c5dd..ace397e 100644
--- a/tests/tcg/cris/sys.c
+++ b/tests/tcg/cris/sys.c
@@ -12,7 +12,7 @@ static inline int mystrlen(char *s) {
 void pass(void) {
 	char s[] = "passed.\n";
 	write (1, s, sizeof (s) - 1);
-	exit (0);
+	exit(EXIT_SUCCESS);
 }
 
 void _fail(char *reason) {
