diff --git a/lib/ts/Diags.cc b/lib/ts/Diags.cc
index a43398be91e..d84cc650e12 100644
--- a/lib/ts/Diags.cc
+++ b/lib/ts/Diags.cc
@@ -333,6 +333,7 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
       va_list tmp;
       va_copy(tmp, ap);
       vprintline(diags_log->m_fp, format_buf_w_ts, tmp);
+      va_end(tmp);
     }
   }
 
@@ -341,6 +342,7 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
       va_list tmp;
       va_copy(tmp, ap);
       vprintline(stdout_log->m_fp, format_buf_w_ts, tmp);
+      va_end(tmp);
     }
   }
 
@@ -349,6 +351,7 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
       va_list tmp;
       va_copy(tmp, ap);
       vprintline(stderr_log->m_fp, format_buf_w_ts, tmp);
+      va_end(tmp);
     }
   }
 
@@ -577,6 +580,8 @@ Diags::error_va(DiagsLevel level, const char *file, const char *func, const int
     }
     ink_fatal_va(format_string, ap2);
   }
+
+  va_end(ap2);
 }
 
 /*
diff --git a/lib/wccp/wccp-test-router.cc b/lib/wccp/wccp-test-router.cc
index 6fbfe17125b..d6064a311d8 100644
--- a/lib/wccp/wccp-test-router.cc
+++ b/lib/wccp/wccp-test-router.cc
@@ -51,6 +51,7 @@ Error(char const *fmt, ...)
   va_start(args, fmt);
   vfprintf(stderr, fmt, args);
   Ready = false;
+  va_end(args);
 }
 
 int