--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -5082,16 +5082,17 @@
     "description": "a testing histogram; not meant to be touched"
   },
   "TELEMETRY_TEST_COUNT": {
     "expires_in_version": "never",
     "kind": "count",
     "description": "a testing histogram; not meant to be touched"
   },
   "TELEMETRY_TEST_COUNT2": {
+    "alert_emails": ["telemetry-client-dev@mozilla.com"],
     "expires_in_version": "never",
     "kind": "count",
     "bug_numbers": [1288745],
     "description": "a testing histogram; not meant to be touched"
   },
   "TELEMETRY_TEST_COUNT_INIT_NO_RECORD": {
     "expires_in_version": "never",
     "kind": "count",
@@ -5163,45 +5164,42 @@
   "TELEMETRY_TEST_KEYED_RELEASE_OPTOUT": {
     "expires_in_version": "never",
     "kind": "flag",
     "keyed": true,
     "releaseChannelCollection": "opt-out",
     "description": "a testing histogram; not meant to be touched"
   },
   "TELEMETRY_TEST_EXPONENTIAL": {
+    "alert_emails": ["telemetry-client-dev@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "low": 1,
     "high": 2147483646,
     "n_buckets": 10,
     "bug_numbers": [1288745],
     "description": "a testing histogram; not meant to be touched"
   },
   "TELEMETRY_TEST_LINEAR": {
+    "alert_emails": ["telemetry-client-dev@mozilla.com"],
     "expires_in_version": "never",
     "kind": "linear",
     "low": 1,
     "high": 2147483646,
     "n_buckets": 10,
     "bug_numbers": [1288745],
     "description": "a testing histogram; not meant to be touched"
   },
   "TELEMETRY_TEST_BOOLEAN": {
+    "alert_emails": ["telemetry-client-dev@mozilla.com"],
     "expires_in_version" : "never",
     "kind": "boolean",
     "bug_numbers": [1288745],
     "description": "a testing histogram; not meant to be touched"
   },
-  "TELEMETRY_TEST_FOOBAR": {
-    "expires_in_version" : "28.0a1",
-    "kind": "flag",
-    "bug_numbers": [1288745],
-    "description": "a testing histogram; not meant to be touched"
-  },
   "STARTUP_CRASH_DETECTED": {
     "expires_in_version": "never",
     "kind": "flag",
     "description": "Whether there was a crash during the last startup"
   },
   "SAFE_MODE_USAGE": {
     "expires_in_version": "never",
     "kind": "enumerated",

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -927,31 +927,26 @@
     "TAP_TO_LOAD_ENABLED",
     "TAP_TO_LOAD_IMAGE_SIZE",
     "TELEMETRY_COMPRESS",
     "TELEMETRY_PING",
     "TELEMETRY_SEND",
     "TELEMETRY_STRINGIFY",
     "TELEMETRY_SUCCESS",
     "TELEMETRY_TEST_COUNT",
-    "TELEMETRY_TEST_COUNT2",
     "TELEMETRY_TEST_COUNT_INIT_NO_RECORD",
     "TELEMETRY_TEST_EXPIRED",
     "TELEMETRY_TEST_FLAG",
     "TELEMETRY_TEST_KEYED_COUNT",
     "TELEMETRY_TEST_KEYED_COUNT_INIT_NO_RECORD",
     "TELEMETRY_TEST_KEYED_FLAG",
     "TELEMETRY_TEST_KEYED_RELEASE_OPTIN",
     "TELEMETRY_TEST_KEYED_RELEASE_OPTOUT",
     "TELEMETRY_TEST_RELEASE_OPTIN",
     "TELEMETRY_TEST_RELEASE_OPTOUT",
-    "TELEMETRY_TEST_EXPONENTIAL",
-    "TELEMETRY_TEST_LINEAR",
-    "TELEMETRY_TEST_BOOLEAN",
-    "TELEMETRY_TEST_FOOBAR",
     "THUNDERBIRD_CONVERSATIONS_TIME_TO_2ND_GLODA_QUERY_MS",
     "THUNDERBIRD_GLODA_SIZE_MB",
     "THUNDERBIRD_INDEXING_RATE_MSG_PER_S",
     "TLS_ERROR_REPORT_UI",
     "TOP_LEVEL_CONTENT_DOCUMENTS_DESTROYED",
     "TOUCH_ENABLED_DEVICE",
     "TRACKING_PROTECTION_ENABLED",
     "TRACKING_PROTECTION_EVENTS",
@@ -2136,31 +2131,26 @@
     "TELEMETRY_SEND",
     "TELEMETRY_SESSIONDATA_FAILED_LOAD",
     "TELEMETRY_SESSIONDATA_FAILED_PARSE",
     "TELEMETRY_SESSIONDATA_FAILED_SAVE",
     "TELEMETRY_SESSIONDATA_FAILED_VALIDATION",
     "TELEMETRY_STRINGIFY",
     "TELEMETRY_SUCCESS",
     "TELEMETRY_TEST_COUNT",
-    "TELEMETRY_TEST_COUNT2",
     "TELEMETRY_TEST_COUNT_INIT_NO_RECORD",
     "TELEMETRY_TEST_EXPIRED",
     "TELEMETRY_TEST_FLAG",
     "TELEMETRY_TEST_KEYED_COUNT",
     "TELEMETRY_TEST_KEYED_COUNT_INIT_NO_RECORD",
     "TELEMETRY_TEST_KEYED_FLAG",
     "TELEMETRY_TEST_KEYED_RELEASE_OPTIN",
     "TELEMETRY_TEST_KEYED_RELEASE_OPTOUT",
     "TELEMETRY_TEST_RELEASE_OPTIN",
     "TELEMETRY_TEST_RELEASE_OPTOUT",
-    "TELEMETRY_TEST_EXPONENTIAL",
-    "TELEMETRY_TEST_LINEAR",
-    "TELEMETRY_TEST_BOOLEAN",
-    "TELEMETRY_TEST_FOOBAR",
     "THUNDERBIRD_CONVERSATIONS_TIME_TO_2ND_GLODA_QUERY_MS",
     "THUNDERBIRD_GLODA_SIZE_MB",
     "THUNDERBIRD_INDEXING_RATE_MSG_PER_S",
     "TLS_ERROR_REPORT_UI",
     "TOP_LEVEL_CONTENT_DOCUMENTS_DESTROYED",
     "TOTAL_CONTENT_PAGE_LOAD_TIME",
     "TOTAL_COUNT_HIGH_ERRORS",
     "TOTAL_COUNT_LOW_ERRORS",

--- a/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
@@ -480,21 +480,20 @@ add_task(function* asyncSetup() {
   yield TelemetryController.testSetup();
   // Load the client ID from the client ID provider to check for pings sanity.
   gClientID = yield ClientID.getClientID();
 });
 
 // Ensures that expired histograms are not part of the payload.
 add_task(function* test_expiredHistogram() {
 
-  let dummy = Telemetry.getHistogramById("TELEMETRY_TEST_FOOBAR");
+  let dummy = Telemetry.getHistogramById("TELEMETRY_TEST_EXPIRED");
 
   dummy.add(1);
 
-  do_check_eq(TelemetrySession.getPayload()["histograms"]["TELEMETRY_TEST_FOOBAR"], undefined);
   do_check_eq(TelemetrySession.getPayload()["histograms"]["TELEMETRY_TEST_EXPIRED"], undefined);
 });
 
 // Sends a ping to a non existing server. If we remove this test, we won't get
 // all the histograms we need in the main ping.
 add_task(function* test_noServerPing() {
   yield sendPing();
   // We need two pings in order to make sure STARTUP_MEMORY_STORAGE_SQLIE histograms

--- a/toolkit/components/telemetry/tests/unit/test_TelemetryStopwatch.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryStopwatch.js
@@ -1,18 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 var tmpScope = {};
 Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", tmpScope);
 var TelemetryStopwatch = tmpScope.TelemetryStopwatch;
 
-// We can't create a histogram here since the ones created with
-// newHistogram are not seen by getHistogramById that the module uses.
-// However becaue of bug_number 1288745, newHistogram is now deprecated and removed.
 const HIST_NAME = "TELEMETRY_PING";
 const HIST_NAME2 = "RANGE_CHECKSUM_ERRORS";
 const KEYED_HIST = { id: "TELEMETRY_INVALID_PING_TYPE_SUBMITTED", key: "TEST" };
 
 var refObj = {}, refObj2 = {};
 
 var originalCount1, originalCount2;
 

--- a/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
+++ b/toolkit/components/telemetry/tests/unit/test_nsITelemetry.js
@@ -436,29 +436,27 @@ add_task(function* test_addons() {
   Telemetry.unregisterAddonHistograms(addon_id);
   snapshots = Telemetry.addonHistogramSnapshots;
   do_check_false(addon_id in snapshots);
   // Make sure other addons are unaffected.
   do_check_true(extra_addon in snapshots);
 });
 
 add_task(function* test_expired_histogram() {
-  var histogram_id = "FOOBAR";
   var test_expired_id = "TELEMETRY_TEST_EXPIRED";
   var clone_id = "ExpiredClone";
-  var dummy = Telemetry.getHistogramById("TELEMETRY_TEST_FOOBAR");
+  var dummy = Telemetry.getHistogramById(test_expired_id);
   var dummy_clone = Telemetry.histogramFrom(clone_id, test_expired_id);
   var rh = Telemetry.registeredHistograms(Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN, []);
   Assert.ok(!!rh);
 
   dummy.add(1);
   dummy_clone.add(1);
 
   do_check_eq(Telemetry.histogramSnapshots["__expired__"], undefined);
-  do_check_eq(Telemetry.histogramSnapshots[histogram_id], undefined);
   do_check_eq(Telemetry.histogramSnapshots[test_expired_id], undefined);
   do_check_eq(Telemetry.histogramSnapshots[clone_id], undefined);
   do_check_eq(rh[test_expired_id], undefined);
 });
 
 add_task(function* test_keyed_histogram() {
   // Check that invalid names get rejected.