diff --git a/test/Makefile.os2 b/test/Makefile.os2
index 59866a056..4cc4cda0b 100644
--- a/test/Makefile.os2
+++ b/test/Makefile.os2
@@ -62,7 +62,7 @@ $(TESTLIB): $(COBJS)
   wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS)} op q op el file {$<} name $@
 
 .c.obj:
-  wcc386 $(CFLAGS) -wcd=107 -fo=$^@ $<
+  wcc386 $(CFLAGS) -fo=$^@ $<
 
 # specials
 testautomation.exe: $(TAOBJS)
diff --git a/test/controllermap.c b/test/controllermap.c
index b52baebfc..61c015a8e 100644
--- a/test/controllermap.c
+++ b/test/controllermap.c
@@ -773,7 +773,7 @@ int
 main(int argc, char *argv[])
 {
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n");
-    exit(1);
+    return 1;
 }
 
 #endif
diff --git a/test/testgamecontroller.c b/test/testgamecontroller.c
index 4d3c93937..8b7f48873 100644
--- a/test/testgamecontroller.c
+++ b/test/testgamecontroller.c
@@ -367,7 +367,7 @@ int
 main(int argc, char *argv[])
 {
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n");
-    exit(1);
+    return 1;
 }
 
 #endif
diff --git a/test/testhaptic.c b/test/testhaptic.c
index bffe4467d..9613629e2 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -363,7 +363,7 @@ int
 main(int argc, char *argv[])
 {
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Haptic support.\n");
-    exit(1);
+    return 1;
 }
 
 #endif
diff --git a/test/testjoystick.c b/test/testjoystick.c
index 16877a152..20e51f59d 100644
--- a/test/testjoystick.c
+++ b/test/testjoystick.c
@@ -379,7 +379,7 @@ int
 main(int argc, char *argv[])
 {
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Joystick support.\n");
-    exit(1);
+    return 1;
 }
 
 #endif
diff --git a/test/testrumble.c b/test/testrumble.c
index c8473f56a..813eeb838 100644
--- a/test/testrumble.c
+++ b/test/testrumble.c
@@ -147,7 +147,7 @@ int
 main(int argc, char *argv[])
 {
     SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL compiled without Haptic support.\n");
-    exit(1);
+    return 1;
 }
 
 #endif