diff --git a/devlib/target.py b/devlib/target.py
index 4b2da428d..57b8aabf7 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -894,6 +894,11 @@ def model(self):
         except KeyError:
             return None
 
+    @property
+    @memoized
+    def external_storage(self):
+        return self.execute('echo $EXTERNAL_STORAGE').strip()
+
     @property
     @memoized
     def screen_resolution(self):
@@ -1267,7 +1272,7 @@ def homescreen(self):
 
     def _resolve_paths(self):
         if self.working_directory is None:
-            self.working_directory = '/data/local/tmp/devlib-target'
+            self.working_directory = self.path.join(self.external_storage, 'devlib-target')
         self._file_transfer_cache = self.path.join(self.working_directory, '.file-cache')
         if self.executables_directory is None:
             self.executables_directory = '/data/local/tmp/bin'