diff --git a/src/libraries/Common/tests/System/TimeProviderTests.cs b/src/libraries/Common/tests/System/TimeProviderTests.cs
index 53e88feb97d2b7..a88285fc75d301 100644
--- a/src/libraries/Common/tests/System/TimeProviderTests.cs
+++ b/src/libraries/Common/tests/System/TimeProviderTests.cs
@@ -140,7 +140,7 @@ public void TestProviderTimer(TimeProvider provider, int MaxMilliseconds)
                             state,
                             TimeSpan.FromMilliseconds(state.Period), TimeSpan.FromMilliseconds(state.Period));
 
-            state.TokenSource.Token.WaitHandle.WaitOne(60000);
+            state.TokenSource.Token.WaitHandle.WaitOne(Timeout.InfiniteTimeSpan);
             state.TokenSource.Dispose();
 
             Assert.Equal(4, state.Counter);
@@ -497,7 +497,14 @@ public bool Change(TimeSpan dueTime, TimeSpan period)
                     period = new TimeSpan(period.Ticks / 2);
                 }
 
-                return _timer.Change(dueTime, period);
+                try
+                {
+                    return _timer.Change(dueTime, period);
+                }
+                catch (ObjectDisposedException)
+                {
+                    return false;
+                }
             }
 
             public void Dispose() => _timer.Dispose();