2 files changed, 8 insertions, 0 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index a7af7b99c..2d4eab36c 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -2150,6 +2150,8 @@ handle_shutdown_peers (void *cls, struct GNUNET_SERVER_Client *client,
   }
   LOG_DEBUG ("Shutting down peers\n");
   /* Stop and destroy all peers */
+  GST_free_occq ();
+  GST_free_roccq ();
   destroy_peers ();
   if (0 == hc->nslaves)
   {
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c
index e75ded9b2..b3128cbab 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -851,6 +851,12 @@ GST_cache_clear ()
   GNUNET_CONTAINER_multihashmap_iterate (cache, &cache_clear_iterator, NULL);
   GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (cache));
   GNUNET_CONTAINER_multihashmap_destroy (cache);
+  cache = NULL;
+  lru_cache_size = 0;
+  lru_cache_threshold_size = 0;
+  cache_size = 0;
+  lru_cache_head = NULL;
+  lru_cache_tail = NULL;
 }