diff --git a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
index 177f344eb..7f9120791 100644
--- a/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
+++ b/src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
@@ -80,8 +80,10 @@ namespace Microsoft.DotNet.Tools.MSBuild
         }
 
         private static string Escape(string arg) =>
+            // this is a workaround for https://github.com/Microsoft/msbuild/issues/1622
              (arg.StartsWith("/p:RestoreSources=", StringComparison.OrdinalIgnoreCase)) ?
-                arg.Replace(";", "%3B") : // <-- this is a workaround for https://github.com/Microsoft/msbuild/issues/1622
+                arg.Replace(";", "%3B") 
+                   .Replace("://", ":%2F%2F") : 
                 arg;
 
         private static string GetMSBuildExePath()
diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs
index d1f8b0c93..52d58a9e7 100644
--- a/test/dotnet.Tests/PackagedCommandTests.cs
+++ b/test/dotnet.Tests/PackagedCommandTests.cs
@@ -41,7 +41,6 @@ namespace Microsoft.DotNet.Tests
                 };
             }
         }
-
         public static IEnumerable<object[]> LibraryDependencyToolArguments
         {
             get