diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c
index 3f5f163..624ddc6 100644
--- a/src/remote-viewer-main.c
+++ b/src/remote-viewer-main.c
@@ -40,7 +40,7 @@ static void
 remote_viewer_version(void)
 {
     g_print(_("remote-viewer version %s\n"), VERSION);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 int
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
index 22e120a..1fddad4 100644
--- a/src/remote-viewer.c
+++ b/src/remote-viewer.c
@@ -398,7 +398,7 @@ spice_ctrl_listen_async_cb(GObject *object,
                                               _("Controller connection failed: %s"),
                                               error->message);
         g_clear_error(&error);
-        exit(1); /* TODO: make start async? */
+        exit(EXIT_FAILURE); /* TODO: make start async? */
     }
 }
 
diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c
index 890250b..3fa674f 100644
--- a/src/virt-viewer-main.c
+++ b/src/virt-viewer-main.c
@@ -37,7 +37,7 @@ static void virt_viewer_version(void)
 {
     g_print(_("%s version %s\n"), PACKAGE, VERSION);
 
-    exit(0);
+    exit(EXIT_SUCCESS);
 }