diff --git a/test/Aggor.t.sol b/test/Aggor.t.sol
index 6a1869f..efdcf9f 100644
--- a/test/Aggor.t.sol
+++ b/test/Aggor.t.sol
@@ -835,7 +835,7 @@ contract AggorTest is Test {
         uint updatedAt;
         uint80 answeredInRound;
         (roundId, answer, startedAt, updatedAt, answeredInRound) =
-            aggor.latestRoundData();
+            aggor.latestRoundData{gas: gasUsage_latestRoundData}();
         assertEq(roundId, 1);
         assertEq(uint(answer), wantVal);
         assertEq(startedAt, 0);
@@ -845,7 +845,7 @@ contract AggorTest is Test {
         uint val;
         uint age;
         IAggor.Status memory status;
-        (val, age, status) = aggor.readWithStatus();
+        (val, age, status) = aggor.readWithStatus{gas: gasUsage_readWithStatus}();
         assertEq(val, wantVal);
         assertEq(age, wantAge);
         assertEq(status.path, wantStatus.path);
diff --git a/test/integration/AggorIntegration_eth_ETH_USD.t.sol b/test/integration/AggorIntegration_eth_ETH_USD.t.sol
index 2f2d19a..76ab9c7 100644
--- a/test/integration/AggorIntegration_eth_ETH_USD.t.sol
+++ b/test/integration/AggorIntegration_eth_ETH_USD.t.sol
@@ -247,7 +247,7 @@ contract AggorIntegrationTest_eth_ETH_USD is Test {
         // optimizer_runs : 10_000
         // via-ir         : false
         uint gasUsage = 9000;
-        while (gasUsage > 500) {
+        while (gasUsage != 0) {
             try aggor.latestAnswer{gas: gasUsage}() returns (int answer) {
                 // Call returned, ie no OOG.
                 // Verify whether Chainlink call was executed.
@@ -296,7 +296,7 @@ contract AggorIntegrationTest_eth_ETH_USD is Test {
         // optimizer_runs : 10_000
         // via-ir         : false
         uint gasUsage = 10_000;
-        while (gasUsage > 500) {
+        while (gasUsage != 0) {
             try aggor.latestRoundData{gas: gasUsage}() returns (
                 uint80, int answer, uint, uint, uint80
             ) {
@@ -347,7 +347,7 @@ contract AggorIntegrationTest_eth_ETH_USD is Test {
         // optimizer_runs : 10_000
         // via-ir         : false
         uint gasUsage = 10_000;
-        while (gasUsage > 500) {
+        while (gasUsage != 0) {
             try aggor.readWithStatus{gas: gasUsage}() returns (
                 uint val, uint, IAggor.Status memory
             ) {