--- a/layout/base/tests/marionette/test_selectioncarets.py
+++ b/layout/base/tests/marionette/test_selectioncarets.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette_driver.by import By
-from marionette_driver.marionette import Actions
+from by import By
+from marionette import Actions
 from marionette_test import MarionetteTestCase
-from marionette_driver.selection import SelectionManager
-from marionette_driver.gestures import long_press_without_contextmenu
+from selection import SelectionManager
+from gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsTest(MarionetteTestCase):
     _long_press_time = 1        # 1 second
     _input_selector = (By.ID, 'input')
     _textarea_selector = (By.ID, 'textarea')
     _textarea_rtl_selector = (By.ID, 'textarea_rtl')
     _contenteditable_selector = (By.ID, 'contenteditable')

--- a/layout/base/tests/marionette/test_selectioncarets_multiplerange.py
+++ b/layout/base/tests/marionette/test_selectioncarets_multiplerange.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from marionette_driver.by import By
-from marionette_driver.marionette import Actions
+from by import By
+from marionette import Actions
 from marionette_test import MarionetteTestCase
-from marionette_driver.selection import SelectionManager
-from marionette_driver.gestures import long_press_without_contextmenu
+from selection import SelectionManager
+from gestures import long_press_without_contextmenu
 
 
 class SelectionCaretsMultipleRangeTest(MarionetteTestCase):
     _long_press_time = 1        # 1 second
 
     def setUp(self):
         # Code to execute before a tests are run.
         MarionetteTestCase.setUp(self)

--- a/testing/marionette/client/marionette/__init__.py
+++ b/testing/marionette/client/marionette/__init__.py
@@ -1,13 +1,39 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from marionette_driver.gestures import smooth_scroll, pinch
+from marionette_driver.by import By
+from marionette_driver.marionette import Marionette, HTMLElement, Actions, MultiActions
 from marionette_test import MarionetteTestCase, MarionetteJSTestCase, CommonTestCase, expectedFailure, skip, SkipTest
+from marionette_driver.errors import (
+    ElementNotVisibleException,
+    ElementNotAccessibleException,
+    ErrorCodes,
+    FrameSendFailureError,
+    FrameSendNotInitializedError,
+    InvalidCookieDomainException,
+    InvalidElementStateException,
+    InvalidResponseException,
+    InvalidSelectorException,
+    JavascriptException,
+    MarionetteException,
+    MoveTargetOutOfBoundsException,
+    NoAlertPresentException,
+    NoSuchElementException,
+    NoSuchFrameException,
+    NoSuchWindowException,
+    ScriptTimeoutException,
+    StaleElementException,
+    TimeoutException,
+    UnableToSetCookieException,
+    XPathLookupException,
+)
 from runner import (
         B2GTestCaseMixin,
         B2GTestResultMixin,
         BaseMarionetteOptions,
         BaseMarionetteTestRunner,
         EnduranceOptionsMixin,
         EnduranceTestCaseMixin,
         HTMLReportingOptionsMixin,
@@ -19,8 +45,11 @@ from runner import (
         MarionetteTextTestRunner,
         MemoryEnduranceTestCaseMixin,
         MozHttpd,
         OptionParser,
         TestManifest,
         TestResult,
         TestResultCollection
 )
+from marionette_driver.wait import Wait
+from marionette_driver.date_time_value import DateTimeValue
+import marionette_driver.decorators

--- a/testing/marionette/driver/marionette_driver/__init__.py
+++ b/testing/marionette/driver/marionette_driver/__init__.py
@@ -1,8 +1,4 @@
 from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
                                 gestures, keys, marionette, selection, wait,
                                 application_cache, date_time_value )
-from marionette_driver.by import By
-from marionette_driver.date_time_value import DateTimeValue
-from marionette_driver.gestures import smooth_scroll, pinch
-from marionette_driver.wait import Wait
-
+from marionette_driver.gestures import smooth_scroll, pinch
\ No newline at end of file