mach-telemetry.diff

diff --git a/build/virtualenv_packages.txt b/build/virtualenv_packages.txt
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -77,4 +77,5 @@ mozilla.pth:third_party/python/pyasn1
 mozilla.pth:third_party/python/pyasn1-modules
 mozilla.pth:third_party/python/rsa
 mozilla.pth:third_party/python/PyECC
+mozilla.pth:toolkit/components/telemetry/tests/marionette/harness
 optional:packages.txt:comm/build/virtualenv_packages.txt
diff --git a/testing/marionette/mach_commands.py b/testing/marionette/mach_commands.py
--- a/testing/marionette/mach_commands.py
+++ b/testing/marionette/mach_commands.py
@@ -33,10 +33,15 @@ def run_marionette(tests, binary=None, t
     from mozlog.structured import commandline

     from marionette_harness.runtests import (
-        MarionetteTestRunner,
+        # MarionetteTestRunner,
         MarionetteHarness
     )

+    from telemetry_harness.runtests import (
+        TelemetryTestRunner as MarionetteTestRunner,
+        # MarionetteHarness
+    )
+
     parser = create_parser_tests()

     if not tests:
diff --git a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
--- a/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
+++ b/toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/testcase.py
@@ -4,7 +4,7 @@

 import os
 import re
-import simplejson as json
+import json
 import time
 import zlib

diff --git a/toolkit/components/telemetry/tests/marionette/tests/unit/test_ping_server_received_ping.py b/toolkit/components/telemetry/tests/marionette/tests/unit/test_ping_server_received_ping.py
--- a/toolkit/components/telemetry/tests/marionette/tests/unit/test_ping_server_received_ping.py
+++ b/toolkit/components/telemetry/tests/marionette/tests/unit/test_ping_server_received_ping.py
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/

 import requests
-import simplejson as json
+import json

 from telemetry_harness.testcase import TelemetryTestCase