diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index c0d7654416e..b57bf0d97f7 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -956,6 +956,10 @@ TelemetryPing.prototype = {
     this.gatherStartupInformation();
   },
 
+  enableLoadSaveNotifications: function enableLoadSaveNotifications() {
+    this._doLoadSaveNotifications = true;
+  },
+
   /**
    * This observer drives telemetry.
    */
@@ -1022,9 +1026,6 @@ TelemetryPing.prototype = {
       this._pingLoadsCompleted = 0;
       this.loadHistograms(aSubject.QueryInterface(Ci.nsIFile), aData != "async");
       break;
-    case "test-enable-load-save-notifications":
-      this._doLoadSaveNotifications = true;
-      break;
     case "test-ping":
       server = aData;
       // fall through
diff --git a/toolkit/components/telemetry/nsITelemetryPing.idl b/toolkit/components/telemetry/nsITelemetryPing.idl
index 411f90577e3..5b7798ecfd5 100644
--- a/toolkit/components/telemetry/nsITelemetryPing.idl
+++ b/toolkit/components/telemetry/nsITelemetryPing.idl
@@ -12,4 +12,5 @@ interface nsITelemetryPing : nsIObserver {
   jsval getPayload();
   void saveHistograms(in nsIFile aFile, in boolean aSync);
   void gatherStartup();
+  void enableLoadSaveNotifications(); /* Used only for testing. */
 };
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js b/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
index 1b7cf476694..ecf517cac63 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryPing.js
@@ -46,7 +46,7 @@ var gFinished = false;
 function telemetry_ping () {
   const TelemetryPing = Cc["@mozilla.org/base/telemetry-ping;1"].getService(Ci.nsITelemetryPing);
   TelemetryPing.gatherStartup();
-  TelemetryPing.observe(null, "test-enable-load-save-notifications", null);
+  TelemetryPing.enableLoadSaveNotifications();
   TelemetryPing.observe(null, "test-ping", SERVER);
 }