From 7cea2914753a735a45cd7bdd40081b718d4c7aca Mon Sep 17 00:00:00 2001
From: Paul Higinbotham <paulhi@microsoft.com>
Date: Thu, 9 Mar 2017 20:14:26 -0800
Subject: [PATCH] Fix Invoke-Command remote debugging test failure in nightly
 build (#3294)

---
 .../Remoting/InvokeCommandRemoteDebug.Tests.ps1       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/powershell/engine/Remoting/InvokeCommandRemoteDebug.Tests.ps1 b/test/powershell/engine/Remoting/InvokeCommandRemoteDebug.Tests.ps1
index c9fb5e98b..e2818a8ba 100644
--- a/test/powershell/engine/Remoting/InvokeCommandRemoteDebug.Tests.ps1
+++ b/test/powershell/engine/Remoting/InvokeCommandRemoteDebug.Tests.ps1
@@ -149,8 +149,6 @@ Describe "Invoke-Command remote debugging tests" -Tags 'Feature' {
 
             [powershell] $ps2 = [powershell]::Create()
             $ps2.Runspace = $rs2
-
-            $remoteSession = New-RemoteSession
         }
     }
 
@@ -171,9 +169,18 @@ Describe "Invoke-Command remote debugging tests" -Tags 'Feature' {
         }
     }
 
+    BeforeEach {
+
+        $remoteSession = New-RemoteSession
+    }
+
     AfterEach {
+
         $ps.Commands.Clear()
         $ps2.Commands.Clear()
+
+        Remove-PSSession $remoteSession -ErrorAction SilentlyContinue
+        $remoteSession = $null
     }
 
     It "Verifies that asynchronous 'Invoke-Command -RemoteDebug' is ignored" {