1 files changed, 9 insertions, 0 deletions

diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index 6a2418e46..895313d1b 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -56,6 +56,7 @@ static struct GNUNET_GNSRECORD_Data *s_rd_3;
 
 struct GNUNET_NAMESTORE_QueueEntry * ns_ops[3];
 
+static char *directory;
 
 static void
 do_shutdown ()
@@ -118,6 +119,11 @@ do_shutdown ()
     GNUNET_free (privkey2);
     privkey2 = NULL;
   }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
 }
 
 
@@ -269,6 +275,9 @@ run (void *cls,
 
   res = 1;
 
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+
   GNUNET_asprintf(&hostkey_file,
                   "zonefiles%s%s",
                   DIR_SEPARATOR_STR,