diff --git a/src/EditorFeatures/CSharpTest/ExtractInterface/ExtractInterfaceTests.cs b/src/EditorFeatures/CSharpTest/ExtractInterface/ExtractInterfaceTests.cs
index 0c4201224979d47b47bb7d2b64acca4ef8cd8bf2..e8e3ef8c7c5cf1b3c87280942eb25c6e7ce8bb9c 100644
--- a/src/EditorFeatures/CSharpTest/ExtractInterface/ExtractInterfaceTests.cs
+++ b/src/EditorFeatures/CSharpTest/ExtractInterface/ExtractInterfaceTests.cs
@@ -1010,7 +1010,7 @@ class Program $$: ISomeInterface<object>
         {
             using (var testState = await ExtractInterfaceTestState.CreateAsync(markup, LanguageNames.CSharp, compilationOptions: null))
             {
-                var result = testState.GetTypeAnalysisResult(typeDiscoveryRule);
+                var result = await testState.GetTypeAnalysisResultAsync(typeDiscoveryRule);
                 Assert.Equal(expectedExtractable, result.CanExtractInterface);
             }
         }
diff --git a/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs b/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs
index 435acec5a091fdd2caa6442c8def360050c34d7a..873d1a7f465306ea5f65f1aa509116d058932172 100644
--- a/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs
+++ b/src/EditorFeatures/Test/ExtractInterface/ExtractInterfaceTestState.cs
@@ -67,13 +67,13 @@ public TestExtractInterfaceOptionsService TestExtractInterfaceOptionsService
             }
         }
 
-        public ExtractInterfaceTypeAnalysisResult GetTypeAnalysisResult(TypeDiscoveryRule typeDiscoveryRule)
+        public Task<ExtractInterfaceTypeAnalysisResult> GetTypeAnalysisResultAsync(TypeDiscoveryRule typeDiscoveryRule)
         {
             return ExtractInterfaceService.AnalyzeTypeAtPositionAsync(
                 ExtractFromDocument,
                 _testDocument.CursorPosition.Value,
                 typeDiscoveryRule,
-                CancellationToken.None).WaitAndGetResult(CancellationToken.None);
+                CancellationToken.None);
         }
 
         public ExtractInterfaceResult ExtractViaCommand()
diff --git a/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs b/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs
index 1bd8eabaa5d44e7dcaa53b5c17ddc740b11d49f8..12694685bf8c1539ea89bb9cd64384d430ad5119 100644
--- a/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs
+++ b/src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs
@@ -195,11 +195,7 @@ public async Task AssertTag(string expectedFromName, string expectedToName, bool
 
             if (invokeAction)
             {
-                var operations = actions[0]
-                    .GetOperationsAsync(CancellationToken.None)
-                    .WaitAndGetResult(CancellationToken.None)
-                    .ToArray();
-
+                var operations = (await actions[0].GetOperationsAsync(CancellationToken.None)).ToArray();
                 Assert.Equal(1, operations.Length);
 
                 operations[0].Apply(this.Workspace, CancellationToken.None);