diff --git a/devtools/client/performance/test/browser.ini b/devtools/client/performance/test/browser.ini
index 244505d910f..9ababa4a863 100644
--- a/devtools/client/performance/test/browser.ini
+++ b/devtools/client/performance/test/browser.ini
@@ -127,7 +127,10 @@ skip-if = os == 'linux' # bug 1186322
 [browser_perf-recording-selected-04.js]
 skip-if = os == 'linux' || debug # bug 1186322 for Linux, bug 1203895 for leaks
 [browser_perf-theme-toggle-01.js]
-[browser_perf-telemetry.js]
+[browser_perf-telemetry-01.js]
+[browser_perf-telemetry-02.js]
+[browser_perf-telemetry-03.js]
+[browser_perf-telemetry-04.js]
 [browser_profiler_tree-abstract-01.js]
 skip-if = e10s && os == 'linux' # bug 1186322
 [browser_profiler_tree-abstract-02.js]
diff --git a/devtools/client/performance/test/browser_perf-telemetry-01.js b/devtools/client/performance/test/browser_perf-telemetry-01.js
new file mode 100644
index 00000000000..f89051388d1
--- /dev/null
+++ b/devtools/client/performance/test/browser_perf-telemetry-01.js
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the performance telemetry module records events at appropriate times.
+ * Specificaly the state about a recording process.
+ */
+
+function* spawnTest() {
+  // This test seems to take a long time to cleanup on Linux VMs.
+  requestLongerTimeout(2);
+
+  PMM_loadFrameScripts(gBrowser);
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView, JsCallTreeView, JsFlameGraphView } = panel.panelWin;
+
+  Services.prefs.setBoolPref(MEMORY_PREF, false);
+  let DURATION = "DEVTOOLS_PERFTOOLS_RECORDING_DURATION_MS";
+  let COUNT = "DEVTOOLS_PERFTOOLS_RECORDING_COUNT";
+  let CONSOLE_COUNT = "DEVTOOLS_PERFTOOLS_CONSOLE_RECORDING_COUNT";
+  let FEATURES = "DEVTOOLS_PERFTOOLS_RECORDING_FEATURES_USED";
+
+  let telemetry = PerformanceController._telemetry;
+  let logs = telemetry.getLogs();
+
+  yield startRecording(panel);
+  yield stopRecording(panel);
+
+  Services.prefs.setBoolPref(MEMORY_PREF, true);
+
+  yield startRecording(panel);
+  yield stopRecording(panel);
+
+  is(logs[DURATION].length, 2, `two entries for ${DURATION}`);
+  ok(logs[DURATION].every(d => typeof d === "number"), `every ${DURATION} entry is a number`);
+  is(logs[COUNT].length, 2, `two entries for ${COUNT}`);
+  is(logs[CONSOLE_COUNT], void 0, `no entries for ${CONSOLE_COUNT}`);
+  is(logs[FEATURES].length, 10, `two recordings worth of entries for ${FEATURES}`);
+  ok(logs[FEATURES].find(r => r[0] === "withMemory" && r[1] === true), "one feature entries for memory enabled");
+  ok(logs[FEATURES].find(r => r[0] === "withMemory" && r[1] === false), "one feature entries for memory disabled");
+
+  yield teardown(panel);
+  finish();
+};
diff --git a/devtools/client/performance/test/browser_perf-telemetry-02.js b/devtools/client/performance/test/browser_perf-telemetry-02.js
new file mode 100644
index 00000000000..a6ef99937fb
--- /dev/null
+++ b/devtools/client/performance/test/browser_perf-telemetry-02.js
@@ -0,0 +1,43 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the performance telemetry module records events at appropriate times.
+ * Specifically export/import.
+ */
+
+function* spawnTest() {
+  // This test seems to take a long time to cleanup on Linux VMs.
+  requestLongerTimeout(2);
+
+  PMM_loadFrameScripts(gBrowser);
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView, JsCallTreeView, JsFlameGraphView } = panel.panelWin;
+
+  Services.prefs.setBoolPref(MEMORY_PREF, false);
+  let EXPORTED = "DEVTOOLS_PERFTOOLS_RECORDING_EXPORT_FLAG";
+  let IMPORTED = "DEVTOOLS_PERFTOOLS_RECORDING_IMPORT_FLAG";
+
+  let telemetry = PerformanceController._telemetry;
+  let logs = telemetry.getLogs();
+
+  yield startRecording(panel);
+  yield stopRecording(panel);
+
+  let file = FileUtils.getFile("TmpD", ["tmpprofile.json"]);
+  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
+  let exported = once(PerformanceController, EVENTS.RECORDING_EXPORTED);
+  yield PerformanceController.exportRecording("", PerformanceController.getCurrentRecording(), file);
+  yield exported;
+
+  ok(logs[EXPORTED], `a telemetry entry for ${EXPORTED} exists after exporting`);
+
+  let imported = once(PerformanceController, EVENTS.RECORDING_IMPORTED);
+  yield PerformanceController.importRecording(null, file);
+  yield imported;
+
+  ok(logs[IMPORTED], `a telemetry entry for ${IMPORTED} exists after importing`);
+
+  yield teardown(panel);
+  finish();
+};
diff --git a/devtools/client/performance/test/browser_perf-telemetry-03.js b/devtools/client/performance/test/browser_perf-telemetry-03.js
new file mode 100644
index 00000000000..e14660304da
--- /dev/null
+++ b/devtools/client/performance/test/browser_perf-telemetry-03.js
@@ -0,0 +1,44 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the performance telemetry module records events at appropriate times.
+ * Specifically the destruction of certain views.
+ */
+
+function* spawnTest() {
+  // This test seems to take a long time to cleanup on Linux VMs.
+  requestLongerTimeout(2);
+
+  PMM_loadFrameScripts(gBrowser);
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView, JsCallTreeView, JsFlameGraphView } = panel.panelWin;
+
+  Services.prefs.setBoolPref(MEMORY_PREF, false);
+  let VIEWS = "DEVTOOLS_PERFTOOLS_SELECTED_VIEW_MS";
+
+  let telemetry = PerformanceController._telemetry;
+  let logs = telemetry.getLogs();
+
+  yield startRecording(panel);
+  yield stopRecording(panel);
+
+  let calltreeRendered = once(JsCallTreeView, EVENTS.JS_CALL_TREE_RENDERED);
+  let flamegraphRendered = once(JsFlameGraphView, EVENTS.JS_FLAMEGRAPH_RENDERED);
+
+  // Go through some views to check later
+  DetailsView.selectView("js-calltree");
+  yield calltreeRendered;
+  DetailsView.selectView("js-flamegraph");
+  yield flamegraphRendered;
+
+  yield teardown(panel);
+
+  // Check views after destruction to ensure `js-flamegraph` gets called with a time
+  // during destruction
+  ok(logs[VIEWS].find(r => r[0] === "waterfall" && typeof r[1] === "number"), `${VIEWS} for waterfall view and time.`);
+  ok(logs[VIEWS].find(r => r[0] === "js-calltree" && typeof r[1] === "number"), `${VIEWS} for js-calltree view and time.`);
+  ok(logs[VIEWS].find(r => r[0] === "js-flamegraph" && typeof r[1] === "number"), `${VIEWS} for js-flamegraph view and time.`);
+
+  finish();
+};
diff --git a/devtools/client/performance/test/browser_perf-telemetry-04.js b/devtools/client/performance/test/browser_perf-telemetry-04.js
new file mode 100644
index 00000000000..0b89ea1ef03
--- /dev/null
+++ b/devtools/client/performance/test/browser_perf-telemetry-04.js
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the performance telemetry module records events at appropriate times.
+ */
+
+function* spawnTest() {
+  // This test seems to take a long time to cleanup on Linux VMs.
+  requestLongerTimeout(2);
+
+  PMM_loadFrameScripts(gBrowser);
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView, JsCallTreeView, JsFlameGraphView } = panel.panelWin;
+
+  Services.prefs.setBoolPref(MEMORY_PREF, false);
+  let DURATION = "DEVTOOLS_PERFTOOLS_RECORDING_DURATION_MS";
+  let CONSOLE_COUNT = "DEVTOOLS_PERFTOOLS_CONSOLE_RECORDING_COUNT";
+  let FEATURES = "DEVTOOLS_PERFTOOLS_RECORDING_FEATURES_USED";
+
+  let telemetry = PerformanceController._telemetry;
+  let logs = telemetry.getLogs();
+
+  yield consoleProfile(panel.panelWin, "rust");
+  yield consoleProfileEnd(panel.panelWin, "rust");
+
+  info("Performed a console recording.");
+
+  is(logs[DURATION].length, 1, `one entry for ${DURATION}`);
+  ok(logs[DURATION].every(d => typeof d === "number"), `every ${DURATION} entry is a number`);
+  is(logs[CONSOLE_COUNT].length, 1, `one entry for ${CONSOLE_COUNT}`);
+  is(logs[FEATURES].length, 5, `one recording worth of entries for ${FEATURES}`);
+
+  yield teardown(panel);
+  finish();
+};
diff --git a/devtools/client/performance/test/browser_perf-telemetry.js b/devtools/client/performance/test/browser_perf-telemetry.js
deleted file mode 100644
index ba0a66c0fc4..00000000000
--- a/devtools/client/performance/test/browser_perf-telemetry.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Tests that the performance telemetry module records events at appropriate times.
- */
-
-function* spawnTest() {
-  PMM_loadFrameScripts(gBrowser);
-  let { panel } = yield initPerformance(SIMPLE_URL);
-  let { EVENTS, PerformanceController, OverviewView, DetailsView, WaterfallView, JsCallTreeView, JsFlameGraphView } = panel.panelWin;
-
-  Services.prefs.setBoolPref(MEMORY_PREF, false);
-  let DURATION = "DEVTOOLS_PERFTOOLS_RECORDING_DURATION_MS";
-  let COUNT = "DEVTOOLS_PERFTOOLS_RECORDING_COUNT";
-  let CONSOLE_COUNT = "DEVTOOLS_PERFTOOLS_CONSOLE_RECORDING_COUNT";
-  let FEATURES = "DEVTOOLS_PERFTOOLS_RECORDING_FEATURES_USED";
-  let VIEWS = "DEVTOOLS_PERFTOOLS_SELECTED_VIEW_MS";
-  let EXPORTED = "DEVTOOLS_PERFTOOLS_RECORDING_EXPORT_FLAG";
-  let IMPORTED = "DEVTOOLS_PERFTOOLS_RECORDING_IMPORT_FLAG";
-
-  let telemetry = PerformanceController._telemetry;
-  let logs = telemetry.getLogs();
-
-  yield startRecording(panel);
-  yield stopRecording(panel);
-
-  Services.prefs.setBoolPref(MEMORY_PREF, true);
-
-  yield startRecording(panel);
-  yield stopRecording(panel);
-
-  is(logs[DURATION].length, 2, `two entry for ${DURATION}`);
-  ok(logs[DURATION].every(d => typeof d === "number"), `every ${DURATION} entry is a number`);
-  is(logs[COUNT].length, 2, `two entry for ${COUNT}`);
-  is(logs[CONSOLE_COUNT], void 0, `no entries for ${CONSOLE_COUNT}`);
-  is(logs[FEATURES].length, 10, `two recordings worth of entries for ${FEATURES}`);
-
-  ok(logs[FEATURES].find(r => r[0] === "withMemory" && r[1] === true), "one feature entry for memory enabled");
-  ok(logs[FEATURES].find(r => r[0] === "withMemory" && r[1] === false), "one feature entry for memory disabled");
-
-  let calltreeRendered = once(JsCallTreeView, EVENTS.JS_CALL_TREE_RENDERED);
-  let flamegraphRendered = once(JsFlameGraphView, EVENTS.JS_FLAMEGRAPH_RENDERED);
-
-  // Go through some views to check later
-  DetailsView.selectView("js-calltree");
-  yield calltreeRendered;
-  DetailsView.selectView("js-flamegraph");
-  yield flamegraphRendered;
-
-  let file = FileUtils.getFile("TmpD", ["tmpprofile.json"]);
-  file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, parseInt("666", 8));
-  let exported = once(PerformanceController, EVENTS.RECORDING_EXPORTED);
-  yield PerformanceController.exportRecording("", PerformanceController.getCurrentRecording(), file);
-  yield exported;
-
-  ok(logs[EXPORTED], `a telemetry entry for ${EXPORTED} exists after exporting`);
-
-  let imported = once(PerformanceController, EVENTS.RECORDING_IMPORTED);
-  yield PerformanceController.importRecording(null, file);
-  yield imported;
-
-  ok(logs[IMPORTED], `a telemetry entry for ${IMPORTED} exists after importing`);
-
-  yield consoleProfile(panel.panelWin, "rust");
-  yield consoleProfileEnd(panel.panelWin, "rust");
-
-  info("Performed a console recording.");
-
-  is(logs[DURATION].length, 3, `three entry for ${DURATION}`);
-  ok(logs[DURATION].every(d => typeof d === "number"), `every ${DURATION} entry is a number`);
-  is(logs[COUNT].length, 2, `two entry for ${COUNT}`);
-  is(logs[CONSOLE_COUNT].length, 1, `one entry for ${CONSOLE_COUNT}`);
-  is(logs[FEATURES].length, 15, `two recordings worth of entries for ${FEATURES}`);
-
-  yield teardown(panel);
-
-  // Check views after destruction to ensure `js-flamegraph` gets called with a time
-  // during destruction
-  ok(logs[VIEWS].find(r => r[0] === "waterfall" && typeof r[1] === "number"), `${VIEWS} for waterfall view and time.`);
-  ok(logs[VIEWS].find(r => r[0] === "js-calltree" && typeof r[1] === "number"), `${VIEWS} for js-calltree view and time.`);
-  ok(logs[VIEWS].find(r => r[0] === "js-flamegraph" && typeof r[1] === "number"), `${VIEWS} for js-flamegraph view and time.`);
-
-  finish();
-};