--- a/devtools/client/memory/test/browser/browser.ini
+++ b/devtools/client/memory/test/browser/browser.ini
@@ -10,21 +10,21 @@ support-files =
   !/devtools/client/framework/test/shared-redux-head.js
 
 [browser_memory_allocationStackDisplay_01.js]
 skip-if = debug # bug 1219554
 [browser_memory_displays_01.js]
 [browser_memory_clear_snapshots.js]
 [browser_memory_diff_01.js]
 [browser_memory_dominator_trees_01.js]
-skip-if = coverage # bug 1347244
+skip-if = ccov # bug 1347244
 [browser_memory_dominator_trees_02.js]
-skip-if = coverage # bug 1347244
+skip-if = ccov # bug 1347244
 [browser_memory_filter_01.js]
-skip-if = coverage # bug 1347244
+skip-if = ccov # bug 1347244
 [browser_memory_individuals_01.js]
 [browser_memory_keyboard.js]
 [browser_memory_keyboard-snapshot-list.js]
 [browser_memory_no_allocation_stacks.js]
 [browser_memory_no_auto_expand.js]
 skip-if = debug # bug 1219554
 [browser_memory_percents_01.js]
 [browser_memory_refresh_does_not_leak.js]

--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -90,17 +90,17 @@ def build_dict(config, env=os.environ):
     d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
     d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
     d['addon_signing'] = substs.get('MOZ_ADDON_SIGNING') == '1'
     d['require_signing'] = substs.get('MOZ_REQUIRE_SIGNING') == '1'
     d['no_legacy_extensions'] = substs.get('MOZ_ALLOW_LEGACY_EXTENSIONS') == '0'
     d['official'] = bool(substs.get('MOZILLA_OFFICIAL'))
     d['updater'] = substs.get('MOZ_UPDATER') == '1'
     d['artifact'] = substs.get('MOZ_ARTIFACT_BUILDS') == '1'
-    d['coverage'] = substs.get('MOZ_CODE_COVERAGE') == '1'
+    d['ccov'] = substs.get('MOZ_CODE_COVERAGE') == '1'
 
     def guess_platform():
         if d['buildapp'] in ('browser', 'mulet'):
             p = d['os']
             if p == 'mac':
                 p = 'macosx64'
             elif d['bits'] == 64:
                 p = '{}64'.format(p)

--- a/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
+++ b/testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini
@@ -115,10 +115,10 @@ skip-if = appname == 'fennec' || os == "
 [test_chrome.py]
 skip-if = appname == 'fennec'
 
 [test_addons.py]
 skip-if = appname == 'fennec' # Bug 1330598
 
 [test_select.py]
 [test_crash.py]
-skip-if = manage_instance == false || appname == 'fennec' || coverage # Bug 1298921, bug 1322993, and bug 1377876
+skip-if = manage_instance == false || appname == 'fennec' || ccov # Bug 1298921, bug 1322993, and bug 1377876
 [test_localization.py]

--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2316,20 +2316,16 @@ toolbar#nav-bar {
         """ Prepare, configure, run tests and cleanup """
 
         # a11y and chrome tests don't run with e10s enabled in CI. Need to set
         # this here since |mach mochitest| sets the flavor after argument parsing.
         if options.flavor in ('a11y', 'chrome'):
             options.e10s = False
         mozinfo.update({"e10s": options.e10s})  # for test manifest parsing.
 
-        # Add flag to mozinfo to indicate that code coverage is enabled.
-        if os.getenv('GCOV_PREFIX') is not None:
-            mozinfo.update({"coverage": True})
-
         self.setTestRoot(options)
 
         # Despite our efforts to clean up servers started by this script, in practice
         # we still see infrequent cases where a process is orphaned and interferes
         # with future tests, typically because the old server is keeping the port in use.
         # Try to avoid those failures by checking for and killing orphan servers before
         # trying to start new ones.
         self.killNamedOrphans('ssltunnel')