diff --git a/Helper/ProgressBar.php b/Helper/ProgressBar.php
index 2dac1dfa2..49e34d8d8 100644
--- a/Helper/ProgressBar.php
+++ b/Helper/ProgressBar.php
@@ -229,7 +229,7 @@ public function getEstimated(): float
 
     public function getRemaining(): float
     {
-        if (!$this->step) {
+        if (0 === $this->step || $this->step === $this->startingStep) {
             return 0;
         }
 
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
index 469353505..4f6e6cb96 100644
--- a/Tests/ApplicationTest.php
+++ b/Tests/ApplicationTest.php
@@ -79,6 +79,7 @@ protected function tearDown(): void
             pcntl_signal(\SIGTERM, \SIG_DFL);
             pcntl_signal(\SIGUSR1, \SIG_DFL);
             pcntl_signal(\SIGUSR2, \SIG_DFL);
+            pcntl_signal(\SIGALRM, \SIG_DFL);
         }
     }
 
diff --git a/Tests/ConsoleEventsTest.php b/Tests/ConsoleEventsTest.php
index 9c04d2706..408f8c0d3 100644
--- a/Tests/ConsoleEventsTest.php
+++ b/Tests/ConsoleEventsTest.php
@@ -39,6 +39,7 @@ protected function tearDown(): void
             pcntl_signal(\SIGTERM, \SIG_DFL);
             pcntl_signal(\SIGUSR1, \SIG_DFL);
             pcntl_signal(\SIGUSR2, \SIG_DFL);
+            pcntl_signal(\SIGALRM, \SIG_DFL);
         }
     }
 
diff --git a/Tests/Helper/ProgressBarTest.php b/Tests/Helper/ProgressBarTest.php
index 88b3e9228..3d1bfa48f 100644
--- a/Tests/Helper/ProgressBarTest.php
+++ b/Tests/Helper/ProgressBarTest.php
@@ -110,6 +110,16 @@ public function testRegularTimeEstimation()
         );
     }
 
+    public function testRegularTimeRemainingWithDifferentStartAtAndCustomDisplay()
+    {
+        $this->expectNotToPerformAssertions();
+
+        ProgressBar::setFormatDefinition('custom', ' %current%/%max% [%bar%] %percent:3s%% %remaining% %estimated%');
+        $bar = new ProgressBar($this->getOutputStream(), 1_200, 0);
+        $bar->setFormat('custom');
+        $bar->start(1_200, 600);
+    }
+
     public function testResumedTimeEstimation()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 1_200, 0);
diff --git a/Tests/SignalRegistry/SignalRegistryTest.php b/Tests/SignalRegistry/SignalRegistryTest.php
index f997f7c1d..92d500f9e 100644
--- a/Tests/SignalRegistry/SignalRegistryTest.php
+++ b/Tests/SignalRegistry/SignalRegistryTest.php
@@ -27,6 +27,7 @@ protected function tearDown(): void
         pcntl_signal(\SIGTERM, \SIG_DFL);
         pcntl_signal(\SIGUSR1, \SIG_DFL);
         pcntl_signal(\SIGUSR2, \SIG_DFL);
+        pcntl_signal(\SIGALRM, \SIG_DFL);
     }
 
     public function testOneCallbackForASignalSignalIsHandled()