diff --git a/tests/ampctl.c b/tests/ampctl.c
index 9b1884840..da664c31a 100644
--- a/tests/ampctl.c
+++ b/tests/ampctl.c
@@ -132,6 +132,7 @@ int main(int argc, char *argv[])
     int serial_rate = 0;
     char conf_parms[MAXCONFLEN] = "";
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -216,6 +217,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -223,7 +225,6 @@ int main(int argc, char *argv[])
             break;
 
         case 'l':
-            rig_set_debug(0);
             list_models();
             exit(0);
 
@@ -241,8 +242,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     rig_debug(RIG_DEBUG_VERBOSE, "ampctl %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
diff --git a/tests/ampctld.c b/tests/ampctld.c
index ece010532..89baf9c62 100644
--- a/tests/ampctld.c
+++ b/tests/ampctld.c
@@ -179,6 +179,7 @@ int main(int argc, char *argv[])
 #endif
 #endif
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -245,6 +246,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -269,8 +271,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     rig_debug(RIG_DEBUG_VERBOSE, "ampctld, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
diff --git a/tests/rigctl.c b/tests/rigctl.c
index 98371ae0b..e001ab4bc 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -240,6 +240,7 @@ int main(int argc, char *argv[])
 
     if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); }
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -438,6 +439,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -445,7 +447,6 @@ int main(int argc, char *argv[])
             break;
 
         case 'l':
-            rig_set_debug(verbose);
             list_models();
             exit(0);
 
@@ -467,8 +468,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     SNPRINTF(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
     for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c
index 1e5dc182f..255628cd0 100644
--- a/tests/rigctlcom.c
+++ b/tests/rigctlcom.c
@@ -227,6 +227,7 @@ int main(int argc, char *argv[])
 
     printf("rigctlcom Version 1.6\n");
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -379,6 +380,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -386,7 +388,6 @@ int main(int argc, char *argv[])
             break;
 
         case 'l':
-            rig_set_debug(verbose);
             list_models();
             exit(0);
 
@@ -404,8 +405,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s, %s\n", "rigctlcom", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
diff --git a/tests/rigctld.c b/tests/rigctld.c
index 6930a1f3a..1f291de61 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
 
     if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); }
 
-
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -494,6 +494,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -546,8 +547,6 @@ int main(int argc, char *argv[])
 
 #endif
 
-    rig_set_debug(verbose);
-
     SNPRINTF(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
     for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
diff --git a/tests/rigctlsync.c b/tests/rigctlsync.c
index d42bf0823..9e332a426 100644
--- a/tests/rigctlsync.c
+++ b/tests/rigctlsync.c
@@ -215,6 +215,7 @@ int main(int argc, char *argv[])
 
     printf("rigctlsync Version 1.0\n");
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -388,6 +389,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -395,7 +397,6 @@ int main(int argc, char *argv[])
             break;
 
         case 'l':
-            rig_set_debug(verbose);
             list_models();
             exit(0);
 
@@ -413,8 +414,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s, %s\n", "rigctlsync", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
diff --git a/tests/rigctltcp.c b/tests/rigctltcp.c
index a927cd37d..0aef3a708 100644
--- a/tests/rigctltcp.c
+++ b/tests/rigctltcp.c
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
 
     if (err) { rig_debug(RIG_DEBUG_ERR, "%s: setvbuf err=%s\n", __func__, strerror(err)); }
 
-
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -481,6 +481,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -548,8 +549,6 @@ int main(int argc, char *argv[])
 
 #endif
 
-    rig_set_debug(verbose);
-
     SNPRINTF(rigstartup, sizeof(rigstartup), "%s(%d) Startup:", __FILE__, __LINE__);
 
     for (i = 0; i < argc; ++i) { strcat(rigstartup, " "); strcat(rigstartup, argv[i]); }
diff --git a/tests/rigmem.c b/tests/rigmem.c
index e3dc115ab..4314e1c2a 100644
--- a/tests/rigmem.c
+++ b/tests/rigmem.c
@@ -105,6 +105,7 @@ int main(int argc, char *argv[])
     char conf_parms[MAXCONFLEN] = "";
     extern char csv_sep;
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -182,6 +183,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         default:
diff --git a/tests/rigsmtr.c b/tests/rigsmtr.c
index b09b6208b..132422ccb 100644
--- a/tests/rigsmtr.c
+++ b/tests/rigsmtr.c
@@ -89,6 +89,7 @@ int main(int argc, char *argv[])
     elevation_t elevation;
     unsigned step = 1000000;    /* 1e6 us */
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -172,6 +173,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         default:
diff --git a/tests/rigswr.c b/tests/rigswr.c
index 995b79a30..e4f64e562 100644
--- a/tests/rigswr.c
+++ b/tests/rigswr.c
@@ -79,6 +79,7 @@ int main(int argc, char *argv[])
     freq_t step = kHz(100);
     value_t pwr;
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -173,6 +174,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         default:
diff --git a/tests/rotctl.c b/tests/rotctl.c
index 88af56f05..fd740c2d2 100644
--- a/tests/rotctl.c
+++ b/tests/rotctl.c
@@ -140,6 +140,7 @@ int main(int argc, char *argv[])
     azimuth_t az_offset = 0;
     elevation_t el_offset = 0;
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -237,6 +238,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -244,7 +246,6 @@ int main(int argc, char *argv[])
             break;
 
         case 'l':
-            rig_set_debug(0);
             list_models();
             exit(0);
 
@@ -262,8 +263,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     rig_debug(RIG_DEBUG_VERBOSE, "rotctl %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");
diff --git a/tests/rotctld.c b/tests/rotctld.c
index 1734ff347..405591bb6 100644
--- a/tests/rotctld.c
+++ b/tests/rotctld.c
@@ -172,6 +172,7 @@ int main(int argc, char *argv[])
 #endif
     struct handle_data *arg;
 
+    rig_set_debug(verbose);
     while (1)
     {
         int c;
@@ -250,6 +251,7 @@ int main(int argc, char *argv[])
 
         case 'v':
             verbose++;
+            rig_set_debug(verbose);
             break;
 
         case 'L':
@@ -274,8 +276,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    rig_set_debug(verbose);
-
     rig_debug(RIG_DEBUG_VERBOSE, "rotctld, %s\n", hamlib_version2);
     rig_debug(RIG_DEBUG_VERBOSE, "%s",
               "Report bugs to <hamlib-developer@lists.sourceforge.net>\n\n");