diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 91762de8..39b365d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,10 +42,10 @@ jobs:
             otp_version: '27.3'
           - elixir_version: '1.19'
             otp_version: '28.3'
+          - elixir_version: '1.20.0'
+            otp_version: '29.0'
             type_check: true
             lint: true
-          - elixir_version: '1.20.0-rc.6'
-            otp_version: '29.0'
 
     steps:
       - name: Checkout
diff --git a/test/benchee/benchmark/runner_test.exs b/test/benchee/benchmark/runner_test.exs
index 05781e00..fffaeec6 100644
--- a/test/benchee/benchmark/runner_test.exs
+++ b/test/benchee/benchmark/runner_test.exs
@@ -480,7 +480,7 @@ defmodule Benchee.Benchmark.RunnerTest do
     end
 
     test "max_sample_size is abided by across all times" do
-      max_sample_size = 3
+      max_sample_size = 2
 
       %Suite{scenarios: [scenario]} =
         %Suite{
diff --git a/test/benchee_test.exs b/test/benchee_test.exs
index 93a3a326..47bd5405 100644
--- a/test/benchee_test.exs
+++ b/test/benchee_test.exs
@@ -534,28 +534,7 @@ defmodule BencheeTest do
         )
 
       Enum.each(suite.scenarios, fn scenario ->
-        # if this becomes flakey, change to <=
-        assert scenario.run_time_data.statistics.sample_size == @default_max_sample_size
-      end)
-    end)
-  end
-
-  @tag :performance
-  test "max_sample_size can be set to `nil` to gather unlimited samples again" do
-    # not disabling the formatters as I want the formatters to run through with that as well
-    capture_io(fn ->
-      suite =
-        Benchee.run(
-          %{
-            "fast" => fn -> :fast end
-          },
-          time: 1,
-          warmup: 0,
-          max_sample_size: nil
-        )
-
-      Enum.each(suite.scenarios, fn scenario ->
-        assert scenario.run_time_data.statistics.sample_size > @default_max_sample_size
+        assert scenario.run_time_data.statistics.sample_size <= @default_max_sample_size
       end)
     end)
   end