PowerShell · iSazonov · Nov 30, 2018 · Nov 18, 2018 · Nov 18, 2018 · Nov 20, 2018
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
@@ -1232,6 +1232,12 @@ protected override void ProcessRecord()
                         ThrowTerminatingError(er);
                     }
 
+                    // Trimming forward and backward slash for FileSystem provider when -Persist is used.
+                    if (Persist && provider.Name.Equals(FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        Root = Root.TrimEnd('/', '\\');
+                    }
+
                     // Create the new drive
                     PSDriveInfo newDrive =
                         new PSDriveInfo(

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/New-PSDrive.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/New-PSDrive.Tests.ps1
@@ -0,0 +1,29 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+Describe "Tests for New-PSDrive cmdlet." -Tag "CI","RequireAdminOnWindows" {
+    Context "Validate New-PSDrive Cmdlet with -Persist switch." {
+        BeforeEach {
+            $UsedDrives  = Get-PSDrive | Select-Object -ExpandProperty Name
+            $PSDriveName = 'D'..'Z' | Where-Object -FilterScript {$_ -notin $UsedDrives} | Get-Random
+            $RemoteShare = "\\$env:COMPUTERNAME\$($env:SystemDrive.replace(':','$\'))"
+        }
+
+        AfterEach {
+            Remove-PSDrive -Name $PSDriveName -Force -ErrorAction SilentlyContinue
+        }
+
+        It "Should not throw exception for persistent PSDrive creation." -Skip:(-not $IsWindows) {
+            { New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root $RemoteShare -Persist -ErrorAction Stop } | Should -Not -Throw
+        }
+
+        it "Should throw exception if root is not a remote share." -Skip:(-not $IsWindows) {
+            { New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root "TestDrive:\" -Persist -ErrorAction Stop } | Should -Throw -ErrorId 'DriveRootNotNetworkPath'
+        }
+
+        it "Should throw exception if PSDrive is not a drive letter supported by operating system." -Skip:(-not $IsWindows) {
+            $PSDriveName = 'AB'
+            { New-PSDrive -Name $PSDriveName -PSProvider FileSystem -Root $RemoteShare -Persist -ErrorAction Stop } | Should -Throw -ErrorId 'DriveNameNotSupportedForPersistence'
+        }
+    }
+}
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/PSDrive.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/PSDrive.Tests.ps1
@@ -1,5 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
+
 Describe "Basic Alias Provider Tests" -Tags "CI" {
     Context "Validate basic PSDrive Cmdlets" {
         BeforeAll {