diff --git a/tests/common-cli.c b/tests/common-cli.c
index 7f7d253e6c..47476711c6 100644
--- a/tests/common-cli.c
+++ b/tests/common-cli.c
@@ -49,6 +49,12 @@ int dump_args(struct vty *vty, const char *descr,
 static void vty_do_exit(void)
 {
   printf ("\nend.\n");
+  cmd_terminate ();
+  vty_terminate ();
+  thread_master_free (master);
+  closezlog (zlog_default);
+
+  log_memstats_stderr ("testcli");
   exit (0);
 }