diff --git a/devlib/target.py b/devlib/target.py
index 4a43bd178..f2b92a2a3 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -1644,10 +1644,10 @@ def __init__(self,
 
     def _resolve_paths(self):
         if self.working_directory is None:
-            self.working_directory = '/tmp'
+            self.working_directory = '/tmp/devlib-target'
         self._file_transfer_cache = self.path.join(self.working_directory, '.file-cache')
         if self.executables_directory is None:
-            self.executables_directory = '/tmp'
+            self.executables_directory = '/tmp/devlib-target/bin'
 
 
 def _get_model_name(section):