diff --git a/unit/test-gobex-apparam.c b/unit/test-gobex-apparam.c
index 573de99..f232380 100644
--- a/unit/test-gobex-apparam.c
+++ b/unit/test-gobex-apparam.c
@@ -416,7 +416,5 @@ int main(int argc, char *argv[])
 	g_test_add_func("/gobex/test_apparam_set_multi",
 						test_apparam_set_multi);
 
-	g_test_run();
-
-	return 0;
+	return g_test_run();
 }
diff --git a/unit/test-gobex-header.c b/unit/test-gobex-header.c
index feb7d17..c933a01 100644
--- a/unit/test-gobex-header.c
+++ b/unit/test-gobex-header.c
@@ -564,7 +564,5 @@ int main(int argc, char *argv[])
 	g_test_add_func("/gobex/test_header_uint32", test_header_uint32);
 	g_test_add_func("/gobex/test_header_apparam", test_header_apparam);
 
-	g_test_run();
-
-	return 0;
+	return g_test_run();
 }
diff --git a/unit/test-gobex-packet.c b/unit/test-gobex-packet.c
index 6da974a..39650f9 100644
--- a/unit/test-gobex-packet.c
+++ b/unit/test-gobex-packet.c
@@ -250,7 +250,5 @@ int main(int argc, char *argv[])
 
 	g_test_add_func("/gobex/test_create_args", test_create_args);
 
-	g_test_run();
-
-	return 0;
+	return g_test_run();
 }
diff --git a/unit/test-gobex-transfer.c b/unit/test-gobex-transfer.c
index 2f05784..f013617 100644
--- a/unit/test-gobex-transfer.c
+++ b/unit/test-gobex-transfer.c
@@ -2251,7 +2251,5 @@ int main(int argc, char *argv[])
 	g_test_add_func("/gobex/test_conn_put_req_seq_srm",
 						test_conn_put_req_seq_srm);
 
-	g_test_run();
-
-	return 0;
+	return g_test_run();
 }
diff --git a/unit/test-gobex.c b/unit/test-gobex.c
index cce5b98..2075f4a 100644
--- a/unit/test-gobex.c
+++ b/unit/test-gobex.c
@@ -1192,7 +1192,5 @@ int main(int argc, char *argv[])
 	g_test_add_func("/gobex/test_copy", test_copy);
 	g_test_add_func("/gobex/test_move", test_move);
 
-	g_test_run();
-
-	return 0;
+	return g_test_run();
 }