diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/OnceInitializedOnceDisposedUnderLockAsyncTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/OnceInitializedOnceDisposedUnderLockAsyncTests.cs
index d2e367a7fc..ec2b57651e 100644
--- a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/OnceInitializedOnceDisposedUnderLockAsyncTests.cs
+++ b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/OnceInitializedOnceDisposedUnderLockAsyncTests.cs
@@ -364,7 +364,7 @@ private static async Task AssertNoOverlap(Func<Task> firstAction, Func<Task> sec
         {
             // Run first task and wait until we've entered it
             var firstTask = firstAction();
-            await firstEntered.WaitAsync();
+            await firstEntered.WaitAsync().WithTimeout(TimeSpan.FromSeconds(30));
 
             // Run second task, we should never enter it
             var secondTask = secondAction();
@@ -374,7 +374,7 @@ private static async Task AssertNoOverlap(Func<Task> firstAction, Func<Task> sec
             firstRelease.Set();
 
             // Now we should enter first one
-            await secondEntered.WaitAsync();
+            await secondEntered.WaitAsync().WithTimeout(TimeSpan.FromSeconds(30));
             await Task.WhenAll(firstTask, secondTask);
         }