diff --git a/wlauto/common/android/device.py b/wlauto/common/android/device.py
index aefa8e86..16faf4a3 100644
--- a/wlauto/common/android/device.py
+++ b/wlauto/common/android/device.py
@@ -52,9 +52,8 @@ class AndroidDevice(BaseLinuxDevice):  # pylint: disable=W0223
                   description='The unique ID of the device as output by "adb devices".'),
         Parameter('android_prompt', kind=regex, default=re.compile('^.*(shell|root)@.*:/\S* [#$] ', re.MULTILINE),
                   description='The format  of matching the shell prompt in Android.'),
-        Parameter('working_directory', default='/sdcard/wa-working',
-                  description='Directory that will be used WA on the device for output files etc.'),
-        Parameter('binaries_directory', default='/data/local/tmp', override=True,
+        Parameter('working_directory', default='/sdcard/wa-working', override=True),
+        Parameter('binaries_directory', default='/data/local/tmp/wa-bin', override=True,
                   description='Location of binaries on the device.'),
         Parameter('package_data_directory', default='/data/data',
                   description='Location of of data for an installed package (APK).'),
diff --git a/wlauto/common/linux/device.py b/wlauto/common/linux/device.py
index 80eaee64..272d5ec1 100644
--- a/wlauto/common/linux/device.py
+++ b/wlauto/common/linux/device.py
@@ -92,6 +92,12 @@ class BaseLinuxDevice(Device):  # pylint: disable=abstract-method
                   '''),
         Parameter('binaries_directory',
                   description='Location of executable binaries on this device (must be in PATH).'),
+        Parameter('working_directory',
+                  description='''
+                  Working directory to be used by WA. This must be in a location where the specified user
+                  has write permissions. This will default to /home/<username>/wa (or to /root/wa, if
+                  username is 'root').
+                  '''),
 
     ]
 
@@ -588,13 +594,6 @@ class LinuxDevice(BaseLinuxDevice):
                   description='Optionally, telnet may be used instead of ssh, though this is discouraged.'),
         Parameter('boot_timeout', kind=int, default=120,
                   description='How long to try to connect to the device after a reboot.'),
-
-        Parameter('working_directory', default=None,
-                  description='''
-                  Working directory to be used by WA. This must be in a location where the specified user
-                  has write permissions. This will default to /home/<username>/wa (or to /root/wa, if
-                  username is 'root').
-                  '''),
     ]
 
     @property