diff --git a/marionette/tor_browser_tests/test_acid3.py b/marionette/tor_browser_tests/test_acid3.py
index 9fa043b0e0cc7ea05ac45347c8c9f103b178205c..c0f2e787dc33f2d4383b593f9783764b511c7a1d 100644
--- a/marionette/tor_browser_tests/test_acid3.py
+++ b/marionette/tor_browser_tests/test_acid3.py
@@ -1,11 +1,7 @@
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException
-
+from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_check.py b/marionette/tor_browser_tests/test_check.py
index dfe4abf69586fd4180bb3ef2bd0c087cdddb7ddc..3d067a9db755f837806da537c351673ec96adf2a 100755
--- a/marionette/tor_browser_tests/test_check.py
+++ b/marionette/tor_browser_tests/test_check.py
@@ -1,6 +1,3 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py
index 88f579211c30a1226bc0f8adba48d268f4d06fde..5d21d1bf1fa75ab8a31eb24eb90666a0ce4e2e70 100644
--- a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py
+++ b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py
@@ -1,4 +1,3 @@
-from marionette_harness import MarionetteTestCase
 import testsuite
 
 class Test(testsuite.TorBrowserTest):
diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py
index 3db436683e3d6655d4dff4dc4083750bafed1913..143a554bc543be23bd21660044241dca158e734e 100644
--- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py
+++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py
@@ -4,10 +4,6 @@
 # This test has been suggested in the iSEC partners' report:
 # https://blog.torproject.org/blog/isec-partners-conducts-tor-browser-hardening-study
 
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
-from marionette_harness import MarionetteTestCase
 import testsuite
 
 class Test(testsuite.TorBrowserTest):
diff --git a/marionette/tor_browser_tests/test_download_pdf.py b/marionette/tor_browser_tests/test_download_pdf.py
index 408f63afdfafe3b00936ffb6b42b33b56b91ad08..6025a64aec92f68133082baa4906a7787a8f6f06 100644
--- a/marionette/tor_browser_tests/test_download_pdf.py
+++ b/marionette/tor_browser_tests/test_download_pdf.py
@@ -1,8 +1,6 @@
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_fp_navigator.py b/marionette/tor_browser_tests/test_fp_navigator.py
index 1453b0f416a028b5643dcdcf6d2048d10823ea85..91dc9518160066040965f5cd226a619743052ce2 100644
--- a/marionette/tor_browser_tests/test_fp_navigator.py
+++ b/marionette/tor_browser_tests/test_fp_navigator.py
@@ -1,8 +1,4 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
 # expected values for navigation properties
diff --git a/marionette/tor_browser_tests/test_fp_plugins.py b/marionette/tor_browser_tests/test_fp_plugins.py
index 3f51d6183ca4b5be2960feca697e5e1f41c14ab8..45981ca16c32d67473e1ce0f0aeb3bac41a7537b 100644
--- a/marionette/tor_browser_tests/test_fp_plugins.py
+++ b/marionette/tor_browser_tests/test_fp_plugins.py
@@ -1,6 +1,3 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_fp_screen_coords.py b/marionette/tor_browser_tests/test_fp_screen_coords.py
index 208430b16da45fd347a516d51dabdaf2c3b09f43..97c27677803e7b9b64d33def00d4d9d9eee1d324 100644
--- a/marionette/tor_browser_tests/test_fp_screen_coords.py
+++ b/marionette/tor_browser_tests/test_fp_screen_coords.py
@@ -1,7 +1,3 @@
-
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_fp_screen_dimensions.py b/marionette/tor_browser_tests/test_fp_screen_dimensions.py
index 879f5c2a7f7b62aef3e4c588a85911890ac664c7..2e0af6d2d5da2b595f66c72a410761c33b282b7b 100644
--- a/marionette/tor_browser_tests/test_fp_screen_dimensions.py
+++ b/marionette/tor_browser_tests/test_fp_screen_dimensions.py
@@ -1,6 +1,3 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_fp_useragent.py b/marionette/tor_browser_tests/test_fp_useragent.py
index a2ef986271596705062298eb65ee3e117d430efd..5b32bb343d9e8da2a9baaf86583ff5925fba9e09 100644
--- a/marionette/tor_browser_tests/test_fp_useragent.py
+++ b/marionette/tor_browser_tests/test_fp_useragent.py
@@ -1,8 +1,4 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_fpcentral.py b/marionette/tor_browser_tests/test_fpcentral.py
index a6981553a189e2eeefa5782e808ab19cb694136f..a7c8020a114f95596f5d99c80856c05d2e5bcf89 100644
--- a/marionette/tor_browser_tests/test_fpcentral.py
+++ b/marionette/tor_browser_tests/test_fpcentral.py
@@ -1,11 +1,6 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_navigation-timing.py b/marionette/tor_browser_tests/test_navigation-timing.py
index 9d3869773c703f4e81dd4b3ea7a12495e3c7595a..ce3cb57ae3e7c3ec019ee03a076b2dc7d4a0483b 100644
--- a/marionette/tor_browser_tests/test_navigation-timing.py
+++ b/marionette/tor_browser_tests/test_navigation-timing.py
@@ -3,10 +3,6 @@
 # Tor Browser. Setting |dom.enable_performance| to |false| and testing that has
 # been not sufficient. See bug 13186 for further details.
 
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
-from marionette_harness import MarionetteTestCase
 import testsuite
 
 class Test(testsuite.TorBrowserTest):
diff --git a/marionette/tor_browser_tests/test_noscript.py b/marionette/tor_browser_tests/test_noscript.py
index 8083098ee11f6555ae9091014cdaad2639f1a884..7d3d2743257a8ee0b01c6779b35fadba0bfa615c 100644
--- a/marionette/tor_browser_tests/test_noscript.py
+++ b/marionette/tor_browser_tests/test_noscript.py
@@ -1,10 +1,7 @@
 # https://trac.torproject.org/projects/tor/ticket/13053
 
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException, NoSuchElementException
-
+from marionette_driver.errors import NoSuchElementException
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_onion_alias.py b/marionette/tor_browser_tests/test_onion_alias.py
index 39dcc4907f3c3889e88c12f7e283e00435dd30fc..8f1dc6787cc7a04acc63aca278e1b548a9d9940b 100644
--- a/marionette/tor_browser_tests/test_onion_alias.py
+++ b/marionette/tor_browser_tests/test_onion_alias.py
@@ -1,11 +1,7 @@
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException
+from marionette_driver import Wait
 from marionette_driver.legacy_actions import Actions
 from marionette_harness import MarionetteTestCase, WindowManagerMixin
 
-import time
-
-
 class Test(WindowManagerMixin, MarionetteTestCase):
     def get_url(self):
         with self.marionette.using_context('content'):
diff --git a/marionette/tor_browser_tests/test_onion_client_auth.py b/marionette/tor_browser_tests/test_onion_client_auth.py
index 38c8a341af40b2b618cac69ea60f163338dc2f77..1686fa76dd9e2f68f5d73a908072aa46900a7ac3 100644
--- a/marionette/tor_browser_tests/test_onion_client_auth.py
+++ b/marionette/tor_browser_tests/test_onion_client_auth.py
@@ -1,21 +1,14 @@
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException
-from marionette_driver.legacy_actions import Actions
+from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase, WindowManagerMixin
-
-import testsuite
-
 from stem.control import Controller
 from stem.process import launch_tor_with_config
-
 from urlparse import urlparse
 from tempfile import mkdtemp
 import shutil
 import os
 import base64
-
 import time
-
+import testsuite
 
 class Test(WindowManagerMixin, MarionetteTestCase):
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_onion_location.py b/marionette/tor_browser_tests/test_onion_location.py
index d028d04961a9759980b9deafa37d7f930ca7d0b0..37acb2d3f53e1739a23d3ec2dc0ed625dfe2fb85 100644
--- a/marionette/tor_browser_tests/test_onion_location.py
+++ b/marionette/tor_browser_tests/test_onion_location.py
@@ -1,9 +1,7 @@
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException
-
+from marionette_driver import Wait
+from marionette_driver.errors import NoSuchElementException, TimeoutException
 from marionette_harness import MarionetteTestCase, WindowManagerMixin
 
-
 class Test(WindowManagerMixin, MarionetteTestCase):
     # To be investigated in #40007:
     # In 81, marionette.get_url() sometimes fails with:
diff --git a/marionette/tor_browser_tests/test_onion_security_expectations.py b/marionette/tor_browser_tests/test_onion_security_expectations.py
index 866ae1e26f23241624459f86f81d7175d36fb962..7a0fd279e0aaa313273b6d7ce7b4807a307c0007 100644
--- a/marionette/tor_browser_tests/test_onion_security_expectations.py
+++ b/marionette/tor_browser_tests/test_onion_security_expectations.py
@@ -1,15 +1,9 @@
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException
-from marionette_driver.legacy_actions import Actions
+from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase, WindowManagerMixin
-
-import testsuite
-
 from stem.control import Controller
-
 from urlparse import urlparse
-
 import time
+import testsuite
 
 class OnionFixturesMixin(object):
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py
index 3d1f4cc9c8ea30fc9a2a98617bf87ce18792496b..f1369c5d570a1f17c0b1a583bef4d1f400224378 100644
--- a/marionette/tor_browser_tests/test_page.py
+++ b/marionette/tor_browser_tests/test_page.py
@@ -1,8 +1,6 @@
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_pinning.py b/marionette/tor_browser_tests/test_pinning.py
index 23e029c22bb68ade851c62a32f88a13d193f0e70..5641e7acef31dd5dfbc53eef3221b3eaa67ffec3 100644
--- a/marionette/tor_browser_tests/test_pinning.py
+++ b/marionette/tor_browser_tests/test_pinning.py
@@ -1,7 +1,6 @@
 from marionette_harness import MarionetteTestCase
-
-import testsuite
 import json
+import testsuite
 
 class Test(MarionetteTestCase):
 
diff --git a/marionette/tor_browser_tests/test_resource-timing.py b/marionette/tor_browser_tests/test_resource-timing.py
index e143f0c7bda1dc18965d95249c4a73ebece096df..9660725a6a39051abef1c8fd6dd397428df72c5c 100644
--- a/marionette/tor_browser_tests/test_resource-timing.py
+++ b/marionette/tor_browser_tests/test_resource-timing.py
@@ -3,9 +3,6 @@
 # Tor Browser. Setting |dom.enable_resource_timing| to |false| and testing that
 # might not be sufficient.
 
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_screenshots.py b/marionette/tor_browser_tests/test_screenshots.py
index b7cc3d6132043174ace00fd71708520e73e0ab9b..4fac52e7edee67f47481bcd440532c005f298584 100755
--- a/marionette/tor_browser_tests/test_screenshots.py
+++ b/marionette/tor_browser_tests/test_screenshots.py
@@ -1,8 +1,4 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_searchengines.py b/marionette/tor_browser_tests/test_searchengines.py
index eeb2c6bc9a09211f716e0fed2a763ac9af952234..9f394f7d07dbdd20cbc9b283716a5352c147a678 100644
--- a/marionette/tor_browser_tests/test_searchengines.py
+++ b/marionette/tor_browser_tests/test_searchengines.py
@@ -6,14 +6,9 @@
 # case while the search engines are still not properly ordered. Rather, we
 # check the entries in the search box directly.
 
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_security_level_ui.py b/marionette/tor_browser_tests/test_security_level_ui.py
index f24e7ea3ff469a7840bbc09670aaacc9c67bbe23..740934f91098a34c4958959712fd58ff08641baa 100644
--- a/marionette/tor_browser_tests/test_security_level_ui.py
+++ b/marionette/tor_browser_tests/test_security_level_ui.py
@@ -1,9 +1,6 @@
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException
-
+from marionette_driver import Wait
 from marionette_harness import MarionetteTestCase
 
-
 class Test(MarionetteTestCase):
     def test_security_level_ui(self):
         custom_pref = 'javascript.options.wasm'
diff --git a/marionette/tor_browser_tests/test_settings.py b/marionette/tor_browser_tests/test_settings.py
index b0a9be432f0bb9924bd0994261eeeb1c855af9e8..f24cdd027b091da030e6c6021daae3410b3a8784 100644
--- a/marionette/tor_browser_tests/test_settings.py
+++ b/marionette/tor_browser_tests/test_settings.py
@@ -1,11 +1,6 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_slider_settings.py b/marionette/tor_browser_tests/test_slider_settings.py
index f61ad21f89494840c987232d840734c80d82d6e1..9b1101ad0d60d07af7452d5f7feb5ef7eee8e605 100644
--- a/marionette/tor_browser_tests/test_slider_settings.py
+++ b/marionette/tor_browser_tests/test_slider_settings.py
@@ -1,11 +1,6 @@
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
-
 class Test(MarionetteTestCase):
 
     def setUp(self):
diff --git a/marionette/tor_browser_tests/test_svg.py b/marionette/tor_browser_tests/test_svg.py
index af55b1bad3c0073734b1cefae3a7007e9c29e578..7dfd120a2408f689e35fa276a11d05bcb375fb71 100644
--- a/marionette/tor_browser_tests/test_svg.py
+++ b/marionette/tor_browser_tests/test_svg.py
@@ -1,7 +1,5 @@
-from marionette_driver.errors import MarionetteException, JavascriptException, NoSuchElementException
-
+from marionette_driver.errors import JavascriptException
 from marionette_harness import MarionetteTestCase
-
 import testsuite
 
 class Test(MarionetteTestCase):
diff --git a/marionette/tor_browser_tests/test_user-timing.py b/marionette/tor_browser_tests/test_user-timing.py
index 9ad56e14995c30cebc26480711eebdc2cc42e5fa..46a74f2e3d31a1a0bbda4c632d8a253cedc441ac 100644
--- a/marionette/tor_browser_tests/test_user-timing.py
+++ b/marionette/tor_browser_tests/test_user-timing.py
@@ -3,9 +3,6 @@
 # Tor Browser. Setting |dom.enable_user_timing| to |false| and testing that
 # might not be sufficient.
 
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-
 from marionette_harness import MarionetteTestCase
 
 class Test(MarionetteTestCase):