diff --git a/tests/rigctl.c b/tests/rigctl.c
index f64ec7e52..1b5246869 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -118,14 +118,6 @@ static struct option long_options[] =
 
 #define MAXCONFLEN 128
 
-/* variable for readline support */
-#ifdef HAVE_LIBREADLINE
-static const int have_rl = 1;
-#else
-static const int have_rl = 0;
-#endif
-
-
 int main(int argc, char *argv[])
 {
     RIG *my_rig;        /* handle to rig (instance) */
@@ -571,7 +563,7 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_LIBREADLINE
 
-    if (interactive && prompt && have_rl)
+    if (interactive && prompt)
     {
         rl_readline_name = "rigctl";
 
@@ -628,7 +620,7 @@ int main(int argc, char *argv[])
 
 #ifdef HAVE_LIBREADLINE
 
-    if (interactive && prompt && have_rl)
+    if (interactive && prompt)
     {
 #ifdef HAVE_READLINE_HISTORY
 
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 891d2fd72..606368401 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -456,8 +456,10 @@ static int scanfc(FILE *fin, const char *format, void *p)
 {
     do
     {
+        int ret;
         *(char *)p = 0;
-        int ret = fscanf(fin, format, p);
+        
+        ret = fscanf(fin, format, p);
 
         if (ret < 0)
         {