@@ -142,8 +142,6 @@ class UnityTestCase(AutopilotTestCase):
142142 self._data_dirs_mock_enabled = True
143143 self._environment = {}
144144
145− self._patch_data_dirs()
146−
147145 #### FIXME: This is a work around re: lp:1238417 ####
148146 if model() != "Desktop":
149147 from autopilot.input import _uinput
@@ -269,6 +267,9 @@ class UnityTestCase(AutopilotTestCase):
269267 if self._qml_mock_enabled:
270268 self._setup_extra_mock_environment_patch()
271269
270+ if self._data_dirs_mock_enabled:
271+ self._patch_data_dirs()
272+
272273 # FIXME: we shouldn't be doing this
273274 # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and
274275 # /tmp/mir_socket as last resort