diff --git a/test/behaviour/CliContext.php b/test/behaviour/CliContext.php
index 204172e6..a5fb3a10 100644
--- a/test/behaviour/CliContext.php
+++ b/test/behaviour/CliContext.php
@@ -5,6 +5,7 @@
 namespace Php\PieBehaviourTest;
 
 use Behat\Behat\Context\Context;
+use Behat\Behat\Tester\Exception\PendingException;
 use Behat\Hook\AfterScenario;
 use Behat\Step\Given;
 use Behat\Step\Then;
@@ -530,6 +531,10 @@ public function iUpdatePIEToTheLatestNightlyVersion(): void
     #[Then('I should see I have been updated to the latest version')]
     public function iShouldSeeIHaveBeenUpdatedToTheLatestVersion(): void
     {
+        if ($this->exitCode !== 0 && str_contains($this->output . $this->errorOutput, 'Attestation certificate identity mismatch')) {
+            throw new PendingException('The published nightly PIE release has not yet been rebuilt against the current default branch - skipping');
+        }
+
         $this->assertCommandSuccessful();
         Assert::contains($this->output, '✅ Verified the new PIE version');
         Assert::contains($this->output, '✅ PIE has been upgraded to nightly');