diff --git a/zorg/buildbot/builders/BOLTBuilder.py b/zorg/buildbot/builders/BOLTBuilder.py
--- a/zorg/buildbot/builders/BOLTBuilder.py
+++ b/zorg/buildbot/builders/BOLTBuilder.py
@@ -1,8 +1,9 @@
 from buildbot.plugins import steps
 from buildbot.steps.shell import ShellCommand
+from zorg.buildbot.builders.UnifiedTreeBuilder import getLLVMBuildFactoryAndSourcecodeSteps, addCmakeSteps, addNinjaSteps
 from zorg.buildbot.commands.LitTestCommand import LitTestCommand
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
-from zorg.buildbot.builders.UnifiedTreeBuilder import getLLVMBuildFactoryAndSourcecodeSteps, addCmakeSteps, addNinjaSteps
+from zorg.buildbot.conditions.FileConditions import FileExists
 from zorg.buildbot.process.factory import LLVMBuildFactory
 
 def getBOLTCmakeBuildFactory(
@@ -92,6 +93,13 @@
                 haltOnFailure=False,
                 flunkOnFailure=False,
                 env=env),
+            ShellCommand(
+                name='check-bolt-different',
+                command='rm -f .llvm-bolt.diff; cmp -s bin/llvm-bolt{.old,.new} || touch .llvm-bolt.diff',
+                description=('Check if llvm-bolt binaries are different'),
+                haltOnFailure=False,
+                flunkOnFailure=False,
+                env=env),
             LitTestCommand(
                 name='nfc-check-bolt',
                 command=['bin/llvm-lit', '-sv', '-j4',
@@ -105,6 +113,7 @@
                 warnOnFailure=True,
                 haltOnFailure=False,
                 flunkOnFailure=False,
+                doStepIf=FileExists('.llvm-bolt.diff'),
                 env=env),
             LitTestCommand(
                 name='nfc-check-large-bolt',
@@ -115,6 +124,7 @@
                 warnOnFailure=True,
                 haltOnFailure=False,
                 flunkOnFailure=False,
+                doStepIf=FileExists('.llvm-bolt.diff'),
                 env=env),
             ])