diff --git a/components/profile/heartbeats.rs b/components/profile/heartbeats.rs
index 5769939843b..7579e6f3a39 100644
--- a/components/profile/heartbeats.rs
+++ b/components/profile/heartbeats.rs
@@ -30,9 +30,13 @@ pub fn init() {
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutTreeBuilder);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutDamagePropagate);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutGeneratedContent);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutDisplayListSorting);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutFloatPlacementSpeculation);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutMain);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutStoreOverflow);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutParallelWarmup);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutDispListBuild);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::NetHTTPRequestResponse);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::PaintingPerTile);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::PaintingPrepBuff);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::Painting);
@@ -43,16 +47,24 @@ pub fn init() {
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptDevtoolsMsg);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptDocumentEvent);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptDomEvent);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptEvaluate);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptEvent);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptFileRead);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptImageCacheMsg);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptInputEvent);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptNetworkEvent);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptParseHTML);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptPlannedNavigation);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptResize);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptUpdateReplacedElement);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptSetScrollState);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptSetViewport);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptTimerEvent);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptStylesheetLoad);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptUpdateReplacedElement);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptWebSocketEvent);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptWorkerEvent);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptServiceWorkerEvent);
+    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptParseXML);
     maybe_create_heartbeat(&mut hbs, ProfilerCategory::ApplicationHeartbeat);
     unsafe {
         HBS = Some(mem::transmute(Box::new(hbs)));
diff --git a/components/profile_traits/lib.rs b/components/profile_traits/lib.rs
index 1a099fb6a32..7f67575f6cb 100644
--- a/components/profile_traits/lib.rs
+++ b/components/profile_traits/lib.rs
@@ -21,6 +21,7 @@ extern crate serde_derive;
 extern crate signpost;
 extern crate util;
 
+#[allow(unsafe_code)]
 pub mod energy;
 pub mod mem;
 pub mod time;
diff --git a/tests/heartbeats/characterize.py b/tests/heartbeats/characterize.py
index 1c4298c9d2a..948f5b9de43 100644
--- a/tests/heartbeats/characterize.py
+++ b/tests/heartbeats/characterize.py
@@ -30,9 +30,13 @@ HEARTBEAT_PROFILER_CATEGORIES = [
     ("LayoutTreeBuilder", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutDamagePropagate", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutGeneratedContent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("LayoutDisplayListSorting", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("LayoutFloatPlacementSpeculation", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutMain", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("LayoutStoreOverflow", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutParallelWarmup", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutDispListBuild", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("NetHTTPRequestResponse", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("PaintingPerTile", 50),
     ("PaintingPrepBuff", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("Painting", HEARTBEAT_DEFAULT_WINDOW_SIZE),
@@ -43,18 +47,24 @@ HEARTBEAT_PROFILER_CATEGORIES = [
     ("ScriptDevtoolsMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptDocumentEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptDomEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptEvaluate", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptFileRead", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptImageCacheMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptInputEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptNetworkEvent", 200),
+    ("ScriptParseHTML", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptPlannedNavigation", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptResize", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptSetScrollState", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptSetViewport", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptTimerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptStylesheetLoad", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptUpdateReplacedElement", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptWebSocketEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptServiceWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptParseXML", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ApplicationHeartbeat", 100),
 ]
 ENERGY_READER_BIN = "energymon-file-provider"