diff --git a/bolt/test/CMakeLists.txt b/bolt/test/CMakeLists.txt
--- a/bolt/test/CMakeLists.txt
+++ b/bolt/test/CMakeLists.txt
@@ -32,6 +32,7 @@
   llvm-config
   llvm-bolt
   llvm-boltdiff
+  llvm-bolt-heatmap
   llvm-dwarfdump
   llvm-mc
   llvm-nm
diff --git a/bolt/test/heatmap.test b/bolt/test/heatmap.test
new file mode 100644
--- /dev/null
+++ b/bolt/test/heatmap.test
@@ -0,0 +1,12 @@
+# Verifies basic functioning of heatmap mode
+
+REQUIRES: system-linux
+XFAIL: *
+
+RUN: llvm-bolt heatmap --help | FileCheck %s --check-prefix=CHECK-SUBCOMMAND
+CHECK-SUBCOMMAND: SUBCOMMAND 'heatmap': generate heatmap
+CHECK-SUBCOMMAND: USAGE: llvm-bolt heatmap [options] <executable>
+
+RUN: llvm-bolt-heatmap --help | FileCheck %s --check-prefix=CHECK-STANDALONE
+CHECK-STANDALONE: SUBCOMMAND 'heatmap': generate heatmap
+CHECK-STANDALONE: USAGE: llvm-bolt-heatmap heatmap [options] <executable>
diff --git a/bolt/test/lit.cfg.py b/bolt/test/lit.cfg.py
--- a/bolt/test/lit.cfg.py
+++ b/bolt/test/lit.cfg.py
@@ -73,6 +73,7 @@
     ToolSubst('llvm-dwarfdump', unresolved='fatal'),
     ToolSubst('llvm-bolt', unresolved='fatal'),
     ToolSubst('llvm-boltdiff', unresolved='fatal'),
+    ToolSubst('llvm-bolt-heatmap', unresolved='fatal'),
     ToolSubst('perf2bolt', unresolved='fatal'),
     ToolSubst('yaml2obj', unresolved='fatal'),
     ToolSubst('llvm-mc', unresolved='fatal'),