diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
index d114598b93b..f3621b44af0 100644
--- a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
+++ b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
@@ -174,6 +174,21 @@ public static string WSHttpBindingBaseAddress
         get { return GetEndpointAddress("WSHttp.svc/"); }
     }
 
+    public static string WSHttpRpcEncSingleNs_Address
+    {
+        get { return GetEndpointAddress("WSHttpRpcEncSingleNs.svc//Basic"); }
+    }
+
+    public static string WSHttpRpcEncDualNs_Address
+    {
+        get { return GetEndpointAddress("WSHttpRpcEncDualNs.svc//Basic"); }
+    }
+
+    public static string WSHttpRpcEncWithHeaders_Address
+    {
+        get { return GetEndpointAddress("WSHttpRpcEncWithHeaders.svc//Basic"); }
+    }
+
     #region WebSocket Addresses
     public static string HttpBaseAddress_NetHttpWebSockets
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.cs
index dc560fc45ef..b7119fdc611 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.cs
@@ -127,14 +127,30 @@ public static void XmlSerializerFormatAttribute_SupportFaults()
     [OuterLoop]
     public static void XmlSerializerFormatEncodedAttributeTest()
     {
-        BasicHttpBinding binding = null;
-        EndpointAddress endpointAddress = null;
+        // *** SETUP *** \\
+        BasicHttpBinding binding = new BasicHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncSingleNs_Address);
+
+        XmlSerializerFormatEncodedAttributeHelper(binding, endpointAddress);
+    }
+
+    [WcfFact]
+    [OuterLoop]
+    public static void XmlSerializerWSHttpFormatEncodedAttributeTest()
+    {
+        // *** SETUP *** \\
+        WSHttpBinding binding = new WSHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.WSHttpRpcEncSingleNs_Address);
+
+        XmlSerializerFormatEncodedAttributeHelper(binding, endpointAddress);
+    }
+
+    private static void XmlSerializerFormatEncodedAttributeHelper(Binding binding, EndpointAddress endpointAddress)
+    {
         ChannelFactory<ICalculatorRpcEnc> factory1 = null;
         ICalculatorRpcEnc serviceProxy1 = null;
 
         // *** SETUP *** \\
-        binding = new BasicHttpBinding();
-        endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncSingleNs_Address);
         factory1 = new ChannelFactory<ICalculatorRpcEnc>(binding, endpointAddress);
         factory1.Endpoint.EndpointBehaviors.Add(new InspectorBehavior());
         serviceProxy1 = factory1.CreateChannel();
@@ -159,14 +175,30 @@ public static void XmlSerializerFormatEncodedAttributeTest()
     [OuterLoop]
     public static void XmlSFAttributeRpcEncSingleNsTest()
     {
-        BasicHttpBinding binding = null;
-        EndpointAddress endpointAddress = null;
+        // *** SETUP *** \\
+        BasicHttpBinding binding = new BasicHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncSingleNs_Address);
+
+        XmlSFAttributeRpcEncSingleNsHelper(binding, endpointAddress);
+    }
+
+    [WcfFact]
+    [OuterLoop]
+    public static void XmlSFAttributeWSHttpRpcEncSingleNsTest()
+    {
+        // *** SETUP *** \\
+        WSHttpBinding binding = new WSHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.WSHttpRpcEncSingleNs_Address);
+
+        XmlSFAttributeRpcEncSingleNsHelper(binding, endpointAddress);
+    }
+
+    private static void XmlSFAttributeRpcEncSingleNsHelper(Binding binding, EndpointAddress endpointAddress)
+    {
         ChannelFactory<ICalculatorRpcEnc> factory1 = null;
         ICalculatorRpcEnc serviceProxy1 = null;
 
         // *** SETUP *** \\
-        binding = new BasicHttpBinding();
-        endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncSingleNs_Address);
         factory1 = new ChannelFactory<ICalculatorRpcEnc>(binding, endpointAddress);
         serviceProxy1 = factory1.CreateChannel();
 
@@ -303,21 +335,38 @@ public static void XmlSFAttributeDocLitSingleNsTest()
     [OuterLoop]
     public static void XmlSFAttributeRpcEncDualNsTest()
     {
-        BasicHttpBinding binding = null;
-        EndpointAddress endpointAddress = null;
+        // *** SETUP *** \\
+        BasicHttpBinding binding = new BasicHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncDualNs_Address);
+
+        XmlSFAttributeRpcEncDualNsHelper(binding, endpointAddress);
+    }
+
+    [WcfFact]
+    [OuterLoop]
+    public static void XmlSFAttributeWSHttpRpcEncDualNsTest()
+    {
+        // *** SETUP *** \\
+        WSHttpBinding binding = new WSHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.WSHttpRpcEncDualNs_Address);
+
+        XmlSFAttributeRpcEncDualNsHelper(binding, endpointAddress);
+    }
+
+
+    private static void XmlSFAttributeRpcEncDualNsHelper(Binding binding, EndpointAddress endpointAddress)
+    {
         ChannelFactory<ICalculatorRpcEnc> factory1 = null;
         ChannelFactory<IHelloWorldRpcEnc> factory2 = null;
         ICalculatorRpcEnc serviceProxy1 = null;
         IHelloWorldRpcEnc serviceProxy2 = null;
 
         // *** SETUP *** \\
-        binding = new BasicHttpBinding();
-        endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncDualNs_Address);
         factory1 = new ChannelFactory<ICalculatorRpcEnc>(binding, endpointAddress);
         serviceProxy1 = factory1.CreateChannel();
         factory2 = new ChannelFactory<IHelloWorldRpcEnc>(binding, endpointAddress);
         serviceProxy2 = factory2.CreateChannel();
-        
+
         // *** EXECUTE Variation *** \\
         try
         {
@@ -474,8 +523,26 @@ public static void XmlSFAttributeDocLitDualNsTest()
     [OuterLoop]
     public static void XmlSFAttributeRpcEncMessageHeaderTest()
     {
-        BasicHttpBinding binding = null;
-        EndpointAddress endpointAddress = null;
+        // *** SETUP *** \\
+        BasicHttpBinding binding = new BasicHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncWithHeaders_Address);
+
+        XmlSFAttributeRpcEncMessageHeaderHelper(binding, endpointAddress);
+    }
+
+    [WcfFact]
+    [OuterLoop]
+    public static void XmlSFAttributeWSHttpRpcEncMessageHeaderTest()
+    {
+        // *** SETUP *** \\
+        WSHttpBinding binding = new WSHttpBinding();
+        EndpointAddress endpointAddress = new EndpointAddress(Endpoints.WSHttpRpcEncWithHeaders_Address);
+
+        XmlSFAttributeRpcEncMessageHeaderHelper(binding, endpointAddress);
+    }
+
+    private static void XmlSFAttributeRpcEncMessageHeaderHelper(Binding binding, EndpointAddress endpointAddress)
+    {
         ChannelFactory<IEchoRpcEncWithHeadersService> factory1 = null;
         IEchoRpcEncWithHeadersService serviceProxy1 = null;
         string echoText = "Hello";
@@ -483,8 +550,6 @@ public static void XmlSFAttributeRpcEncMessageHeaderTest()
         string expectedHeaderText = headerText + headerText;
 
         // *** SETUP *** \\
-        binding = new BasicHttpBinding();
-        endpointAddress = new EndpointAddress(Endpoints.BasicHttpRpcEncWithHeaders_Address);
         factory1 = new ChannelFactory<IEchoRpcEncWithHeadersService>(binding, endpointAddress);
         serviceProxy1 = factory1.CreateChannel();