diff --git a/testing/marionette/client/marionette/runner/base.py b/testing/marionette/client/marionette/runner/base.py
index 135fd812e154..ede0e49dfda1 100644
--- a/testing/marionette/client/marionette/runner/base.py
+++ b/testing/marionette/client/marionette/runner/base.py
@@ -942,6 +942,9 @@ setReq.onerror = function() {
         if self.httpd:
             self.httpd.stop()
 
+        if self.marionette:
+            self.marionette.cleanup()
+
     __del__ = cleanup
 
     def generate_xml(self, results_list):