diff --git a/src/chatty-application.c b/src/chatty-application.c
index 96fa3ff1013dd004b07844538c0388f901725737..9eba8df8b47869f0e733de51cccc48a29a0d22b2 100644
--- a/src/chatty-application.c
+++ b/src/chatty-application.c
@@ -156,7 +156,7 @@ chatty_application_show_about (GSimpleAction *action,
   adw_show_about_dialog (GTK_WIDGET (gtk_application_get_active_window (user_data)),
                          "application-name", _("Chats"),
                          "application-icon", CHATTY_APP_ID,
-                         "version", GIT_VERSION,
+                         "version", CHATTY_GIT_VERSION,
                          "comments", _("An SMS and XMPP messaging client"),
                          "website", "https://gitlab.gnome.org/World/Chatty",
                          "copyright", "© 2018–2023 Purism SPC",
@@ -323,7 +323,7 @@ chatty_application_handle_local_options (GApplication *application,
                                          GVariantDict *options)
 {
   if (g_variant_dict_contains (options, "version")) {
-    g_print ("%s %s\n", PACKAGE_NAME, GIT_VERSION);
+    g_print ("%s %s\n", PACKAGE_NAME, CHATTY_GIT_VERSION);
     return 0;
   }
 
@@ -381,7 +381,7 @@ chatty_application_startup (GApplication *application)
 
   G_APPLICATION_CLASS (chatty_application_parent_class)->startup (application);
 
-  g_info ("%s %s, git version: %s", PACKAGE_NAME, PACKAGE_VERSION, GIT_VERSION);
+  g_info ("%s %s, git version: %s", PACKAGE_NAME, PACKAGE_VERSION, CHATTY_GIT_VERSION);
 
   cm_init (TRUE);
 
diff --git a/src/version.h.in b/src/version.h.in
index 61f64cb1d80e52fb9c6dc8470c64459a7ed40908..1d3dc842e584df856baa5ccd942163d5390293ca 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -1,3 +1,3 @@
 #pragma once
 
-#define GIT_VERSION "@VCS_TAG@"
+#define CHATTY_GIT_VERSION "@VCS_TAG@"
diff --git a/tests/pgp.c b/tests/pgp.c
index 7182466b6d2cfb15e1e366198f967f3aaa675b78..a9eb092b6b742a4921b9c8bb61f7f2880b7add0a 100644
--- a/tests/pgp.c
+++ b/tests/pgp.c
@@ -428,7 +428,7 @@ create_key_cb (GObject      *object,
   g_assert_nonnull (fingerprint);
 
   /* We can check the newly created key */
-  system ("gpg --list-keys");
+  g_assert (system ("gpg --list-keys") == 0);
 
   /* Delete the key in case we run tests multiple times */
   system_args = g_strdup_printf ("gpg --batch --yes --delete-secret-key %s < /dev/null > /dev/null 2>&1", fingerprint);