diff --git a/tests/rigctl.c b/tests/rigctl.c
index 6e027faf8..58a2b6b03 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -154,6 +154,7 @@ int main(int argc, char *argv[])
     int ext_resp = 0;
     char resp_sep = '\n';
     int i;
+    char rigstartup[1024];
 
     while (1)
     {
@@ -440,11 +441,11 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) Startup:", __FILE__, __LINE__);
+    snprintf(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
-    for (i = 0; i < argc; ++i) { rig_debug(RIG_DEBUG_VERBOSE, " %s", argv[i]); }
+    for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s", "\n");
+    rig_debug(RIG_DEBUG_VERBOSE, "%s\n", rigstartup);
 
 
     rig_debug(RIG_DEBUG_VERBOSE, "rigctl %s\n", hamlib_version2);
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 508ae8cdf..854227e03 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -257,6 +257,7 @@ int main(int argc, char *argv[])
     int uplink = 0;
     char host[NI_MAXHOST];
     char serv[NI_MAXSERV];
+    char rigstartup[1024];
 #if HAVE_SIGACTION
     struct sigaction act;
 #endif
@@ -577,12 +578,11 @@ int main(int argc, char *argv[])
 
     rig_set_debug(verbose);
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d) Startup:", __FILE__, __LINE__);
+    snprintf(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
-    for (i = 0; i < argc; ++i) { rig_debug(RIG_DEBUG_VERBOSE, " %s", argv[i]); }
-
-    rig_debug(RIG_DEBUG_VERBOSE, "%s", "\n");
+    for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
 
+    rig_debug(RIG_DEBUG_VERBOSE, "%s\n", rigstartup);
 
     rig_debug(RIG_DEBUG_VERBOSE, "rigctld %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",