3 files changed, 7 insertions, 3 deletions

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 981ce142a..550885007 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -341,6 +341,7 @@ main (int argc, char *const *argv)
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",
@@ -361,13 +362,15 @@ main (int argc, char *const *argv)
 #endif
                     NULL);       
   ok = 1; /* set to fail */
-  return (GNUNET_OK ==
+  ret = (GNUNET_OK ==
           GNUNET_PROGRAM_run (5,
                               argv_prog,
                               "test-plugin-transport",
                               "testcase",
                               options,
                               &run, NULL)) ? ok : 1;
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
+  return ret;
 }
 
 /* end of test_plugin_transport.c */
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index fe05589d9..05e41d612 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-plugin-transport/
+SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
 
 [resolver]
 PORT = 2364
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index ae4ba3c76..f98bce573 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -294,7 +294,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
   return ret;
 }