diff --git a/src/drivers/kinetis/tone_alarm/tone_alarm.cpp b/src/drivers/kinetis/tone_alarm/tone_alarm.cpp
index a005b35b85..ca31d992ae 100644
--- a/src/drivers/kinetis/tone_alarm/tone_alarm.cpp
+++ b/src/drivers/kinetis/tone_alarm/tone_alarm.cpp
@@ -460,7 +460,7 @@ int tone_alarm_main(int argc, char *argv[])
 		if (!strcmp(argv1, "start")) {
 			if (g_dev != nullptr) {
 				PX4_ERR("already started");
-				exit(1);
+				return 1;
 			}
 
 			if (g_dev == nullptr) {
@@ -468,33 +468,33 @@ int tone_alarm_main(int argc, char *argv[])
 
 				if (g_dev == nullptr) {
 					PX4_ERR("couldn't allocate the ToneAlarm driver");
-					exit(1);
+					return 1;
 				}
 
 				if (OK != g_dev->init()) {
 					delete g_dev;
 					g_dev = nullptr;
 					PX4_ERR("ToneAlarm init failed");
-					exit(1);
+					return 1;
 				}
 			}
 
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "stop")) {
 			delete g_dev;
 			g_dev = nullptr;
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "status")) {
 			g_dev->status();
-			exit(0);
+			return 0;
 		}
 
 	}
 
 	tone_alarm_usage();
-	exit(0);
+	return 0;
 }
diff --git a/src/drivers/samv7/tone_alarm/tone_alarm.cpp b/src/drivers/samv7/tone_alarm/tone_alarm.cpp
index d6277e4846..a7aa90683f 100644
--- a/src/drivers/samv7/tone_alarm/tone_alarm.cpp
+++ b/src/drivers/samv7/tone_alarm/tone_alarm.cpp
@@ -456,7 +456,7 @@ int tone_alarm_main(int argc, char *argv[])
 		if (!strcmp(argv1, "start")) {
 			if (g_dev != nullptr) {
 				PX4_ERR("already started");
-				exit(1);
+				return 1;
 			}
 
 			if (g_dev == nullptr) {
@@ -464,34 +464,34 @@ int tone_alarm_main(int argc, char *argv[])
 
 				if (g_dev == nullptr) {
 					PX4_ERR("couldn't allocate the ToneAlarm driver");
-					exit(1);
+					return 1;
 				}
 
 				if (OK != g_dev->init()) {
 					delete g_dev;
 					g_dev = nullptr;
 					PX4_ERR("ToneAlarm init failed");
-					exit(1);
+					return 1;
 				}
 			}
 
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "stop")) {
 			delete g_dev;
 			g_dev = nullptr;
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "status")) {
 			g_dev->status();
-			exit(0);
+			return 0;
 		}
 
 	}
 
 	tone_alarm_usage();
-	exit(0);
+	return 0;
 }
 #endif /* TONE_ALARM_CHANNEL */
diff --git a/src/drivers/stm32/tone_alarm/tone_alarm.cpp b/src/drivers/stm32/tone_alarm/tone_alarm.cpp
index 026d8d4b78..871f70cf5c 100644
--- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp
+++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp
@@ -546,7 +546,7 @@ int tone_alarm_main(int argc, char *argv[])
 		if (!strcmp(argv1, "start")) {
 			if (g_dev != nullptr) {
 				PX4_ERR("already started");
-				exit(1);
+				return 1;
 			}
 
 			if (g_dev == nullptr) {
@@ -554,33 +554,33 @@ int tone_alarm_main(int argc, char *argv[])
 
 				if (g_dev == nullptr) {
 					PX4_ERR("couldn't allocate the ToneAlarm driver");
-					exit(1);
+					return 1;
 				}
 
 				if (OK != g_dev->init()) {
 					delete g_dev;
 					g_dev = nullptr;
 					PX4_ERR("ToneAlarm init failed");
-					exit(1);
+					return 1;
 				}
 			}
 
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "stop")) {
 			delete g_dev;
 			g_dev = nullptr;
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "status")) {
 			g_dev->status();
-			exit(0);
+			return 0;
 		}
 
 	}
 
 	tone_alarm_usage();
-	exit(0);
+	return 0;
 }
diff --git a/src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp b/src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp
index 076c4330f9..3e738aacc7 100644
--- a/src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp
+++ b/src/platforms/posix/drivers/tonealrmsim/tone_alarm.cpp
@@ -326,7 +326,7 @@ int tone_alarm_main(int argc, char *argv[])
 		if (!strcmp(argv1, "start")) {
 			if (g_dev != nullptr) {
 				PX4_ERR("already started");
-				exit(1);
+				return 1;
 			}
 
 			if (g_dev == nullptr) {
@@ -334,33 +334,33 @@ int tone_alarm_main(int argc, char *argv[])
 
 				if (g_dev == nullptr) {
 					PX4_ERR("couldn't allocate the ToneAlarm driver");
-					exit(1);
+					return 1;
 				}
 
 				if (OK != g_dev->init()) {
 					delete g_dev;
 					g_dev = nullptr;
 					PX4_ERR("ToneAlarm init failed");
-					exit(1);
+					return 1;
 				}
 			}
 
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "stop")) {
 			delete g_dev;
 			g_dev = nullptr;
-			exit(0);
+			return 0;
 		}
 
 		if (!strcmp(argv1, "status")) {
 			g_dev->status();
-			exit(0);
+			return 0;
 		}
 
 	}
 
 	tone_alarm_usage();
-	exit(0);
+	return 0;
 }