diff --git a/testing/marionette/client/marionette/b2g_update_test.py b/testing/marionette/client/marionette/b2g_update_test.py
index ea1c4d2b04e7..5c832922e469 100644
--- a/testing/marionette/client/marionette/b2g_update_test.py
+++ b/testing/marionette/client/marionette/b2g_update_test.py
@@ -12,8 +12,8 @@ import types
 import weakref
 
 from b2ginstance import B2GInstance
-from errors import InvalidResponseException
-from marionette import Marionette
+from marionette_driver.errors import InvalidResponseException
+from marionette_driver.marionette import Marionette
 from marionette_test import MarionetteTestCase
 from marionette_transport import MarionetteTransport
 from runtests import MarionetteTestRunner, cli
diff --git a/testing/marionette/client/marionette/tests/unit/test_element_touch.py b/testing/marionette/client/marionette/tests/unit/test_element_touch.py
index 7b9f047a9576..539782ace7e1 100644
--- a/testing/marionette/client/marionette/tests/unit/test_element_touch.py
+++ b/testing/marionette/client/marionette/tests/unit/test_element_touch.py
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import MarionetteException
+from marionette_driver.errors import MarionetteException
 
 class testElementTouch(MarionetteTestCase):
     def test_touch(self):
diff --git a/testing/marionette/client/marionette/tests/unit/test_emulator.py b/testing/marionette/client/marionette/tests/unit/test_emulator.py
index f330d983dba7..e69d996d27b0 100644
--- a/testing/marionette/client/marionette/tests/unit/test_emulator.py
+++ b/testing/marionette/client/marionette/tests/unit/test_emulator.py
@@ -3,7 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException, MarionetteException
+from marionette_driver.errors import (JavascriptException,
+                                      MarionetteException)
 
 
 class TestEmulatorContent(MarionetteTestCase):
diff --git a/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py b/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
index d6b49cd39b15..cdde7f47f816 100644
--- a/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
+++ b/testing/marionette/client/marionette/tests/unit/test_switch_frame_chrome.py
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette_test import MarionetteTestCase
-from errors import JavascriptException
-from by import By
+from marionette_driver.errors import JavascriptException
+from marionette_driver.by import By
 
 class TestSwitchFrameChrome(MarionetteTestCase):
     def setUp(self):
diff --git a/testing/marionette/driver/marionette_driver/__init__.py b/testing/marionette/driver/marionette_driver/__init__.py
index aff2e13acace..0c82dcdad253 100644
--- a/testing/marionette/driver/marionette_driver/__init__.py
+++ b/testing/marionette/driver/marionette_driver/__init__.py
@@ -1,3 +1,4 @@
 from marionette_driver import ( errors, by, decorators, expected, geckoinstance,
                                 gestures, keys, marionette, selection, wait,
-                                application_cache, date_time_value )
\ No newline at end of file
+                                application_cache, date_time_value )
+from marionette_driver.gestures import smooth_scroll, pinch
\ No newline at end of file