diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
index 02767023c..fd8a8721b 100644
--- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
+++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
@@ -1057,7 +1057,9 @@ public async Task CanSendCompletionAndCompletionResolveRequestAsync()
             Assert.Contains("Writes customized output to a host", updatedCompletionItem.Documentation.String);
         }
 
-        [SkippableFact(Skip = "Completion for Expand-SlowArchive is flaky.")]
+
+        // [SkippableFact(Skip = "Completion for Expand-SlowArchive is flaky.")]
+        [Fact]
         public async Task CanSendCompletionResolveWithModulePrefixRequestAsync()
         {
             await PsesLanguageClient
@@ -1084,9 +1086,7 @@ await PsesLanguageClient
             CompletionItem completionItem = Assert.Single(completionItems,
                 completionItem1 => completionItem1.Label == "Expand-SlowArchive");
 
-            CompletionItem updatedCompletionItem = await PsesLanguageClient
-                .SendRequest("completionItem/resolve", completionItem)
-                .Returning<CompletionItem>(CancellationToken.None);
+            CompletionItem updatedCompletionItem = await PsesLanguageClient.ResolveCompletion(completionItem);
 
             Assert.Contains("Extracts files from a specified archive", updatedCompletionItem.Documentation.String);
         }
@@ -1123,22 +1123,21 @@ public async Task CanSendSignatureHelpRequestAsync()
         {
             string filePath = NewTestFile("Get-Date -");
 
-            SignatureHelp signatureHelp = await PsesLanguageClient
-                .SendRequest(
-                    "textDocument/signatureHelp",
-                    new SignatureHelpParams
+            SignatureHelp signatureHelp = await PsesLanguageClient.RequestSignatureHelp
+            (
+                new SignatureHelpParams
+                {
+                    TextDocument = new TextDocumentIdentifier
                     {
-                        TextDocument = new TextDocumentIdentifier
-                        {
-                            Uri = new Uri(filePath)
-                        },
-                        Position = new Position
-                        {
-                            Line = 0,
-                            Character = 10
-                        }
-                    })
-                .Returning<SignatureHelp>(CancellationToken.None);
+                        Uri = new Uri(filePath)
+                    },
+                    Position = new Position
+                    {
+                        Line = 0,
+                        Character = 10
+                    }
+                }
+            );
 
             Assert.Contains("Get-Date", signatureHelp.Signatures.First().Label);
         }
diff --git a/test/PowerShellEditorServices.Test.E2E/xunit.runner.json b/test/PowerShellEditorServices.Test.E2E/xunit.runner.json
index 09cc13a99..f1c3b37cd 100644
--- a/test/PowerShellEditorServices.Test.E2E/xunit.runner.json
+++ b/test/PowerShellEditorServices.Test.E2E/xunit.runner.json
@@ -2,8 +2,9 @@
   "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json",
   "appDomain": "denied",
   "parallelizeTestCollections": true,
-  "parallelAlgorithm": "aggressive",
+  "parallelAlgorithm": "conservative",
   "methodDisplay": "method",
   "diagnosticMessages": true,
-  "longRunningTestSeconds": 60
+  "longRunningTestSeconds": 10,
+  "showLiveOutput": true
 }