diff --git a/test/Libraries/Microsoft.Extensions.TimeProvider.Testing.Tests/TimerTests.cs b/test/Libraries/Microsoft.Extensions.TimeProvider.Testing.Tests/TimerTests.cs
index 0fc6f2d9b8b..c0046cc0429 100644
--- a/test/Libraries/Microsoft.Extensions.TimeProvider.Testing.Tests/TimerTests.cs
+++ b/test/Libraries/Microsoft.Extensions.TimeProvider.Testing.Tests/TimerTests.cs
@@ -226,15 +226,18 @@ public void WaiterRemovedAfterDispose()
 
         timer1.Dispose();
 
+        var waitersCountAfterDispose = timeProvider.Waiters.Count;
+
         timeProvider.Advance(TimeSpan.FromMilliseconds(1));
 
-        var waitersCountAfter = timeProvider.Waiters.Count;
+        var waitersCountOnFinish = timeProvider.Waiters.Count;
 
         Assert.Equal(0, waitersCountStart);
         Assert.Equal(2, waitersCountDuring);
+        Assert.Equal(1, waitersCountAfterDispose);
+        Assert.Equal(1, waitersCountOnFinish);
         Assert.Equal(1, timer1Counter);
         Assert.Equal(2, timer2Counter);
-        Assert.Equal(1, waitersCountAfter);
     }
 
 #if RELEASE // In Release only since this might not work if the timer reference being tracked by the debugger