diff --git a/erts/emulator/test/float_SUITE_data/fp_drv.c b/erts/emulator/test/float_SUITE_data/fp_drv.c
index a91d622040db..f10d39412a24 100644
--- a/erts/emulator/test/float_SUITE_data/fp_drv.c
+++ b/erts/emulator/test/float_SUITE_data/fp_drv.c
@@ -123,7 +123,7 @@ static ErlDrvSSizeT control(ErlDrvData drv_data,
 	    res_str = "skip: no thread support";
 	else if (0 != erl_drv_thread_create("test", &tid, do_test, NULL, NULL))
 	    res_str = "failed to create thread";
-	else if (0 != erl_drv_thread_join(tid, &res_str))
+	else if (0 != erl_drv_thread_join(tid, (void**)&res_str))
 	    res_str = "failed to join thread";
 	break;
     }
diff --git a/erts/emulator/test/port_SUITE_data/dead_port.c b/erts/emulator/test/port_SUITE_data/dead_port.c
index 26f09f33c731..723f0bc67da0 100644
--- a/erts/emulator/test/port_SUITE_data/dead_port.c
+++ b/erts/emulator/test/port_SUITE_data/dead_port.c
@@ -40,7 +40,7 @@
 #include "winbase.h"
 #endif
 
-#define MAIN(argc, argv) main(argc, argv)
+#define MAIN(argc, argv) int main(argc, argv)
 
 extern int errno;
 
diff --git a/erts/emulator/test/signal_SUITE_data/unlink_signal_drv.c b/erts/emulator/test/signal_SUITE_data/unlink_signal_drv.c
index f441e311827f..ba80c8f5adf3 100644
--- a/erts/emulator/test/signal_SUITE_data/unlink_signal_drv.c
+++ b/erts/emulator/test/signal_SUITE_data/unlink_signal_drv.c
@@ -61,7 +61,7 @@ DRIVER_INIT(unlink_signal_entry)
 }
 
 typedef struct {
-    ErlDrvData port;
+    ErlDrvPort port;
     int timeout_count;
 } us_drv_state;