diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index baacfe14..44251c2f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,4 +18,3 @@ jobs:
       - uses: go-semantic-release/action@2e9dc4247a6004f8377781bef4cb9dad273a741f # v1.24.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          force-bump-patch-version: true # ensure patch version updates trigger releases
diff --git a/test/infrastructure/CrossRatePriceFeed.t.sol b/test/infrastructure/CrossRatePriceFeed.t.sol
index 87a39b4c..3620265c 100644
--- a/test/infrastructure/CrossRatePriceFeed.t.sol
+++ b/test/infrastructure/CrossRatePriceFeed.t.sol
@@ -38,9 +38,11 @@ contract CrossRatePriceFeedTest is Test {
         (,,, uint256 numeratorUpdatedAt,) = usdcUsdFeed.latestRoundData();
         (,,, uint256 denominatorUpdatedAt,) = ethUsdFeed.latestRoundData();
 
-        // Warp to the later of the two update times to ensure both are fresh
-        uint256 latestUpdate = numeratorUpdatedAt > denominatorUpdatedAt ? numeratorUpdatedAt : denominatorUpdatedAt;
-        vm.warp(latestUpdate);
+        // Warp to just before the earliest feed expiration
+        uint256 numeratorExpiry = numeratorUpdatedAt + USDC_USD_HEARTBEAT;
+        uint256 denominatorExpiry = denominatorUpdatedAt + ETH_USD_HEARTBEAT;
+        uint256 minExpiry = numeratorExpiry < denominatorExpiry ? numeratorExpiry : denominatorExpiry;
+        vm.warp(minExpiry - 1);
     }
 
     /// @notice test constructor reverts with zero numerator feed