diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/BasicHttpBindingTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/BasicHttpBindingTests.4.0.0.cs
index acc8691e3d9..676d083caab 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/BasicHttpBindingTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/BasicHttpBindingTests.4.0.0.cs
@@ -14,7 +14,7 @@
 using Microsoft.Extensions.Hosting;
 using Xunit;
 
-public static class Binding_Http_BasicHttpBindingTests
+public class Binding_Http_BasicHttpBindingTests : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(WSMessageEncoding.Text)]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/OperationContextTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/OperationContextTests.cs
index ceeb0e3a86f..1a136afecb7 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/OperationContextTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/OperationContextTests.cs
@@ -11,7 +11,7 @@
 using ScenarioTests.Common;
 using Xunit;
 
-public static class OperationContextTests
+public class OperationContextTests : ConditionalWcfTest
 {
 #pragma warning disable xUnit1013 // Public method should be marked as test
     [ModuleInitializer]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/WSHttpBindingTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/WSHttpBindingTests.cs
index a92cee4dbac..dab870dd267 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/WSHttpBindingTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/WSHttpBindingTests.cs
@@ -5,7 +5,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class Binding_Http_WSHttpBindingTests
+public class Binding_Http_WSHttpBindingTests : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(WSMessageEncoding.Text)]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/OperationContextAsyncFlowTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/OperationContextAsyncFlowTests.cs
index e2307632773..0a19fc3eda9 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/OperationContextAsyncFlowTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/OperationContextAsyncFlowTests.cs
@@ -11,7 +11,7 @@
 using ScenarioTests.Common;
 using Xunit;
 
-public class OperationContextAsyncFlowTests
+public class OperationContextAsyncFlowTests : ConditionalWcfTest
 {
     [WcfFact]
     public static async Task OperationContextScopeAsyncFlow()
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.0.0.cs
index 5488ea319f1..36a1b2956dc 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.0.0.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public partial class RequestReplyChannelShapeTests
+public partial class RequestReplyChannelShapeTests : ConditionalWcfTest
 {
     // Creating a ChannelFactory using a binding's 'BuildChannelFactory' method and providing a channel shape...
     //       returns a concrete type determined by the channel shape requested and other binding related settings.
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ChannelBaseTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ChannelBaseTests.4.0.0.cs
index 29dc5a5c1bd..ef23afcb4a7 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ChannelBaseTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ChannelBaseTests.4.0.0.cs
@@ -10,7 +10,7 @@
 
 [assembly: FailFastAfter("00:01:00")]
 
-public static partial class ChannelBaseTests_4_0_0
+public partial class ChannelBaseTests_4_0_0 : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs
index c2792c6195e..8f23444f0d5 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public partial class ClientBaseTests
+public partial class ClientBaseTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.4.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.4.0.cs
index 2b20b0ab2b7..8af650fab97 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.4.0.cs
@@ -12,7 +12,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class ClientBaseTests_4_4_0
+public partial class ClientBaseTests_4_4_0 : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/MessageInspectorTests.4.4.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/MessageInspectorTests.4.4.0.cs
index 14dd4f1529a..40116892e64 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/MessageInspectorTests.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/MessageInspectorTests.4.4.0.cs
@@ -13,7 +13,7 @@
 using TestTypes;
 using Xunit;
 
-public static class MessageInspectorTests
+public class MessageInspectorTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/SessionTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/SessionTests.cs
index a79295b4c2c..1570e647cf5 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/SessionTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/SessionTests.cs
@@ -9,7 +9,7 @@
 using Xunit;
 using System.Threading;
 
-public static class SessionTests
+public class SessionTests : ConditionalWcfTest
 {
     // A basic test to verify that a session gets created and terminated
     [WcfFact]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs
index 7bd5594148f..1356f110b8c 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs
@@ -12,7 +12,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-public partial class ExpectedExceptionTests
+public partial class ExpectedExceptionTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
index 3878d0acac4..9563ddc4805 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
@@ -11,7 +11,7 @@
 using System.Threading.Tasks;
 using Xunit;
 
-public partial class ExpectedExceptionTests
+public partial class ExpectedExceptionTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyDuplexTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyDuplexTests.4.1.0.cs
index e6ca0dab72b..ff3287a92ec 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyDuplexTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyDuplexTests.4.1.0.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TypedProxyDuplexTests
+public class TypedProxyDuplexTests : ConditionalWcfTest
 {
     // ServiceContract typed proxy tests create a ChannelFactory using a provided [ServiceContract] Interface which...
     //       returns a generated proxy based on that Interface.
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs
index 03ce5b9df0c..de38fcaa685 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class TypedProxyTests
+public partial class TypedProxyTests : ConditionalWcfTest
 {
     // ServiceContract typed proxy tests create a ChannelFactory using a provided [ServiceContract] Interface which...
     //       returns a generated proxy based on that Interface.
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs
index 859856a75b6..07727a72eb9 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class TypedProxyTests
+public partial class TypedProxyTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs
index fb4e3792d88..c20b1a89f73 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public partial class DataContractTests
+public partial class DataContractTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs
index f427a22b6ab..6dcb27d5b5e 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs
@@ -13,7 +13,7 @@
 using System.Xml;
 using System.Linq;
 
-public partial class DataContractTests
+public partial class DataContractTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.4.0.0.cs
index 7e6d76cb8f0..bd1e626bf23 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.4.0.0.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class FaultExceptionTests
+public partial class FaultExceptionTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.cs
index 770842e51c1..b46290de223 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/FaultExceptionTests.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class FaultExceptionTests
+public partial class FaultExceptionTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.1.0.cs
index ddb29e4bad5..dcfb5150a32 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.1.0.cs
@@ -9,7 +9,7 @@
 using MessageContractCommon;
 using Xunit;
 
-public static class MessageContractTests_4_1_0
+public class MessageContractTests_4_1_0 : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.4.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.4.0.cs
index 70b007617b7..8876864c99b 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.4.4.0.cs
@@ -8,7 +8,7 @@
 using WcfService;
 using Xunit;
 
-public static class MessageContractTests_4_4_0
+public class MessageContractTests_4_4_0 : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.cs
index 47cfd14b49e..87287e09777 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageContractTests.cs
@@ -9,7 +9,7 @@
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
 
-public static class MessageContractTests
+public class MessageContractTests : ConditionalWcfTest
 {
     public static MessageHeader customHeaderMustUnderstand_True = MessageHeader.CreateHeader("MustUnderstand_True", "http://tempuri.org/MustUnderstand_True_Namespace", "EmptyObject", true);
     public static MessageHeader customHeaderMustUnderstand_False = MessageHeader.CreateHeader("MustUnderstand_False", "http://tempuri.org/MustUnderstand_False_Namespace", "EmptyObject", false);
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageTests.4.0.0.cs
index 4bb877304d5..604b7249d9f 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/MessageTests.4.0.0.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class MessageTests
+public class MessageTests : ConditionalWcfTest
 {
     private const string action = "http://tempuri.org/IWcfService/MessageRequestReply";
     private const string clientMessage = "Test Custom_Message_RoundTrips.";
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.0.0.cs
index dfdf3198e92..ae45206b46a 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.0.0.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class ServiceContractTests
+public partial class ServiceContractTests : ConditionalWcfTest
 {
     // End operation includes keyword "out" on an Int as an arg.
     [WcfFact]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.1.0.cs
index 14a273610fb..b3e402a94a6 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceContractTests.4.1.0.cs
@@ -15,7 +15,7 @@
 using ScenarioTests.Common;
 using Xunit;
 
-public static partial class ServiceContractTests
+public partial class ServiceContractTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceKnownTypeTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceKnownTypeTests.4.0.0.cs
index 22ad4530c12..014b470c448 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceKnownTypeTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/ServiceKnownTypeTests.4.0.0.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class ServiceKnownTypeTests
+public class ServiceKnownTypeTests : ConditionalWcfTest
 {
     public delegate object[] EchoItemsMethod(object[] items);
 
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatSoapTest.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatSoapTest.cs
index 5b331161ba7..fd982777956 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatSoapTest.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatSoapTest.cs
@@ -9,7 +9,7 @@
 using Xunit;
 using System;
 
-public static partial class XmlSerializerFormatTests
+public partial class XmlSerializerFormatTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.0.0.cs
index 6868bd563bd..fe63f2c88bb 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.0.0.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class XmlSerializerFormatTests
+public partial class XmlSerializerFormatTests : ConditionalWcfTest
 {
     private static readonly string s_basicEndpointAddress = Endpoints.HttpBaseAddress_Basic_Text;
 
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.1.0.cs
index 3b1db9c5e6d..6771ace8445 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.4.1.0.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class XmlSerializerFormatTests
+public partial class XmlSerializerFormatTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
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 7091d01a0d8..6aee5e05380 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/XmlSerializerFormatTest.cs
@@ -50,7 +50,7 @@ public object BeforeSendRequest(ref Message request, IClientChannel channel)
     }
 }
 
-public static partial class XmlSerializerFormatTests
+public partial class XmlSerializerFormatTests : ConditionalWcfTest
 {
 #if SVCUTILTESTS
     private static readonly string s_serializationModeSetterName = "set_Mode";
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/BinaryEncodingTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/BinaryEncodingTests.4.0.0.cs
index fed468f504c..41c315f859c 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/BinaryEncodingTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/BinaryEncodingTests.4.0.0.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class BinaryEncodingTests
+public class BinaryEncodingTests : ConditionalWcfTest
 {
     // Client and Server bindings setup exactly the same using Binary Message encoder
     // and exchanging a basic message
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.0.0.cs
index 9fb5c94770a..202520e4b67 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.0.0.cs
@@ -7,7 +7,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class TextEncodingTests
+public partial class TextEncodingTests : ConditionalWcfTest
 {
     // Simple echo of a string. Same binding on both client and server. CustomBinding with TextMessageEncoding and no WindowsStreamSecurityBindingElement
     [WcfFact]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.1.0.cs
index 3a335c7aa0c..61f5e7db395 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/TextEncodingTests.4.1.0.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class TextEncodingTests
+public partial class TextEncodingTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.4.0.0.cs
index abd23006127..294434bbc10 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.4.0.0.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class MessageVersionTests
+public partial class MessageVersionTests : ConditionalWcfTest
 {
     // Client and Server bindings setup exactly the same using Soap12WSA10
     [WcfFact]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs
index e9849c425fe..f9bce7e7a0a 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/MessageVersionTests.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class MessageVersionTests
+public partial class MessageVersionTests : ConditionalWcfTest
 {
     // Client and Server bindings setup exactly the same using Soap12WSA10
     [WcfFact]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs
index f017a7b7fda..34db3962c19 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TextTests
+public class TextTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/OSAndFrameworkTests.4.1.1.cs b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/OSAndFrameworkTests.4.1.1.cs
index 23c0afc6b8b..21497261c90 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/OSAndFrameworkTests.4.1.1.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/OSAndFrameworkTests.4.1.1.cs
@@ -7,7 +7,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class OSAndFrameworkTests
+public class OSAndFrameworkTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/WcfFactTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/WcfFactTests.cs
index f2fab2f13ca..51bdf58ea0c 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/WcfFactTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/WcfFactTests.cs
@@ -14,7 +14,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class WcfFactTests
+public class WcfFactTests : ConditionalWcfTest
 {
     // Tests that do not skip are allowed to run to test [WcfFact]
     // This also triggers lazy initialization of all the skippable
diff --git a/src/System.ServiceModel.Federation/tests/WSTrustChannelFactoryTest.cs b/src/System.ServiceModel.Federation/tests/WSTrustChannelFactoryTest.cs
index 592f8eff8ea..b9550710d70 100644
--- a/src/System.ServiceModel.Federation/tests/WSTrustChannelFactoryTest.cs
+++ b/src/System.ServiceModel.Federation/tests/WSTrustChannelFactoryTest.cs
@@ -7,7 +7,7 @@
 
 namespace System.ServiceModel.Federation.Tests
 {
-    public static class WSTrustChannelFactoryTest
+    public class WSTrustChannelFactoryTest : ConditionalWcfTest
     {
         [WcfFact]
         public static void DefaultWSTrustChannelFactory()
diff --git a/src/System.ServiceModel.Federation/tests/WSTrustChannelSecurityTokenProviderTest.cs b/src/System.ServiceModel.Federation/tests/WSTrustChannelSecurityTokenProviderTest.cs
index 37e93e8cbac..26dcdb0932e 100644
--- a/src/System.ServiceModel.Federation/tests/WSTrustChannelSecurityTokenProviderTest.cs
+++ b/src/System.ServiceModel.Federation/tests/WSTrustChannelSecurityTokenProviderTest.cs
@@ -17,7 +17,7 @@
 
 namespace System.ServiceModel.Federation.Tests
 {
-    public static class WSTrustChannelSecurityTokenProviderTest
+    public class WSTrustChannelSecurityTokenProviderTest : ConditionalWcfTest
     {
         [WcfFact]
         public static void EnsibilityTest()
diff --git a/src/System.ServiceModel.Federation/tests/WSTrustChannelTest.cs b/src/System.ServiceModel.Federation/tests/WSTrustChannelTest.cs
index d2838587cc3..a78ed8d1061 100644
--- a/src/System.ServiceModel.Federation/tests/WSTrustChannelTest.cs
+++ b/src/System.ServiceModel.Federation/tests/WSTrustChannelTest.cs
@@ -7,7 +7,7 @@
 
 namespace System.ServiceModel.Federation.Tests
 {
-    public static class WSTrustChannelTest
+    public class WSTrustChannelTest : ConditionalWcfTest
     {
         [WcfFact]
         public static void WSTrustChannelParameters()
diff --git a/src/System.ServiceModel.Http/tests/Channels/HttpRequestMessagePropertyTest.cs b/src/System.ServiceModel.Http/tests/Channels/HttpRequestMessagePropertyTest.cs
index b31f4a46aa2..c6d32ae9844 100644
--- a/src/System.ServiceModel.Http/tests/Channels/HttpRequestMessagePropertyTest.cs
+++ b/src/System.ServiceModel.Http/tests/Channels/HttpRequestMessagePropertyTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class HttpRequestMessagePropertyTest
+public class HttpRequestMessagePropertyTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Default_Ctor_Initializes_Properties()
diff --git a/src/System.ServiceModel.Http/tests/Channels/WebSocketTransportSettingsTest.cs b/src/System.ServiceModel.Http/tests/Channels/WebSocketTransportSettingsTest.cs
index 20ceb27dd28..783a999f129 100644
--- a/src/System.ServiceModel.Http/tests/Channels/WebSocketTransportSettingsTest.cs
+++ b/src/System.ServiceModel.Http/tests/Channels/WebSocketTransportSettingsTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class WebSocketTransportSettingsTest
+public class WebSocketTransportSettingsTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void DisablePayloadMasking_Property_Set_PNSE_Throws()
diff --git a/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpBindingTest.cs b/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpBindingTest.cs
index 851c1fd66e7..cd121f7d829 100644
--- a/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpBindingTest.cs
+++ b/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpBindingTest.cs
@@ -14,7 +14,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class BasicHttpBindingTest
+public class BasicHttpBindingTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Default_Ctor_Initializes_Properties()
diff --git a/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpSecurityTest.cs b/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpSecurityTest.cs
index 3af86279d44..8a3c020d79c 100644
--- a/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpSecurityTest.cs
+++ b/src/System.ServiceModel.Http/tests/ServiceModel/BasicHttpSecurityTest.cs
@@ -12,7 +12,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class BasicHttpSecurityTest
+public class BasicHttpSecurityTest : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(BasicHttpSecurityMode.Message)]
diff --git a/src/System.ServiceModel.Http/tests/ServiceModel/HttpIdentityTests.cs b/src/System.ServiceModel.Http/tests/ServiceModel/HttpIdentityTests.cs
index 083fd4844a6..008af27b0fb 100644
--- a/src/System.ServiceModel.Http/tests/ServiceModel/HttpIdentityTests.cs
+++ b/src/System.ServiceModel.Http/tests/ServiceModel/HttpIdentityTests.cs
@@ -6,7 +6,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class HttpIdentityTests
+public class HttpIdentityTests : ConditionalWcfTest
 {
     [WcfFact]
     public static void SpnEndpointIdentity_NotSupportedThrows()
diff --git a/src/System.ServiceModel.Http/tests/ServiceModel/SecurityBindingElementTest.cs b/src/System.ServiceModel.Http/tests/ServiceModel/SecurityBindingElementTest.cs
index 37012024634..001babc0e29 100644
--- a/src/System.ServiceModel.Http/tests/ServiceModel/SecurityBindingElementTest.cs
+++ b/src/System.ServiceModel.Http/tests/ServiceModel/SecurityBindingElementTest.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class SecurityBindingElementTest
+public class SecurityBindingElementTest : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(BasicHttpSecurityMode.TransportCredentialOnly)]
diff --git a/src/System.ServiceModel.NetNamedPipe/tests/NetNamedPipeBindingTest.cs b/src/System.ServiceModel.NetNamedPipe/tests/NetNamedPipeBindingTest.cs
index 759bcbf9f9d..4d8c597a371 100644
--- a/src/System.ServiceModel.NetNamedPipe/tests/NetNamedPipeBindingTest.cs
+++ b/src/System.ServiceModel.NetNamedPipe/tests/NetNamedPipeBindingTest.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class NetNamedPipeBindingTest
+public class NetNamedPipeBindingTest : ConditionalWcfTest
 {
     [WcfFact]
     [SupportedOSPlatform("windows")]
diff --git a/src/System.ServiceModel.NetTcp/tests/Channels/TcpConnectionPoolSettingsTest.cs b/src/System.ServiceModel.NetTcp/tests/Channels/TcpConnectionPoolSettingsTest.cs
index 7b2d9487767..2d90dd8cd3e 100644
--- a/src/System.ServiceModel.NetTcp/tests/Channels/TcpConnectionPoolSettingsTest.cs
+++ b/src/System.ServiceModel.NetTcp/tests/Channels/TcpConnectionPoolSettingsTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TcpConnectionPoolSettingsTest
+public class TcpConnectionPoolSettingsTest : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData("")]
diff --git a/src/System.ServiceModel.NetTcp/tests/Channels/TcpTransportBindingElementTest.cs b/src/System.ServiceModel.NetTcp/tests/Channels/TcpTransportBindingElementTest.cs
index beea23cd760..6c0045da863 100644
--- a/src/System.ServiceModel.NetTcp/tests/Channels/TcpTransportBindingElementTest.cs
+++ b/src/System.ServiceModel.NetTcp/tests/Channels/TcpTransportBindingElementTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TcpTransportBindingElementTest
+public class TcpTransportBindingElementTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Properties()
diff --git a/src/System.ServiceModel.NetTcp/tests/ServiceModel/MessageSecurityOverTcpTest.cs b/src/System.ServiceModel.NetTcp/tests/ServiceModel/MessageSecurityOverTcpTest.cs
index 5e57cf9d282..7690e21680c 100644
--- a/src/System.ServiceModel.NetTcp/tests/ServiceModel/MessageSecurityOverTcpTest.cs
+++ b/src/System.ServiceModel.NetTcp/tests/ServiceModel/MessageSecurityOverTcpTest.cs
@@ -7,7 +7,7 @@
 using Xunit;
 using Infrastructure.Common;
 
-public static class MessageSecurityOverTcpTest
+public class MessageSecurityOverTcpTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Properties()
diff --git a/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpBindingTest.cs b/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpBindingTest.cs
index 4773e250a1a..34b2a40e0cb 100644
--- a/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpBindingTest.cs
+++ b/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpBindingTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class NetTcpBindingTest
+public class NetTcpBindingTest : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(SecurityMode.None)]
diff --git a/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpSecurityTest.cs b/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpSecurityTest.cs
index 7fcc291bca8..026dbd078b1 100644
--- a/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpSecurityTest.cs
+++ b/src/System.ServiceModel.NetTcp/tests/ServiceModel/NetTcpSecurityTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class NetTcpSecurityTest
+public class NetTcpSecurityTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Initializes_Properties()
diff --git a/src/System.ServiceModel.NetTcp/tests/ServiceModel/TcpTransportSecurityTest.cs b/src/System.ServiceModel.NetTcp/tests/ServiceModel/TcpTransportSecurityTest.cs
index 24a0dffc667..a6ea5a62f0c 100644
--- a/src/System.ServiceModel.NetTcp/tests/ServiceModel/TcpTransportSecurityTest.cs
+++ b/src/System.ServiceModel.NetTcp/tests/ServiceModel/TcpTransportSecurityTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TcpTransportSecurityTest
+public class TcpTransportSecurityTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Properties()
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/BehaviorExtensionTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/BehaviorExtensionTest.cs
index 15a8c65ef9e..ac48d834a7d 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/BehaviorExtensionTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/BehaviorExtensionTest.cs
@@ -14,7 +14,7 @@
 using Xunit;
 using System.Threading.Tasks;
 
-public static class BehaviorExtensionTest
+public class BehaviorExtensionTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void BehaviorExtension_OperationBehaviorAttribute()
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/BinaryMessageEncodingBindingElementTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/BinaryMessageEncodingBindingElementTest.cs
index 1d0f4c1ca1a..391af8e55f7 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/BinaryMessageEncodingBindingElementTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/BinaryMessageEncodingBindingElementTest.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class BinaryMessageEncodingBindingElementTest
+public class BinaryMessageEncodingBindingElementTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Default_Ctor_Initializes_Properties()
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/CommunicationObjectTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/CommunicationObjectTest.cs
index df84c6c38cb..5e846358c0c 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/CommunicationObjectTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/CommunicationObjectTest.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class CommunicationObjectTest
+public class CommunicationObjectTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void CommunicationObject_Sync_Open_Close_Methods_Called()
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/CustomBindingTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/CustomBindingTest.cs
index d50dedc7f4d..3fd77d4286a 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/CustomBindingTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/CustomBindingTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class CustomBindingTest
+public class CustomBindingTest : ConditionalWcfTest
 {
     [WcfFact]
     // Create the channel factory and open the channel for the request-reply message exchange pattern.
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/CustomChannelTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/CustomChannelTest.cs
index 64ba077f8f2..6f403702655 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/CustomChannelTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/CustomChannelTest.cs
@@ -14,7 +14,7 @@
 using Xunit;
 using System.Threading.Tasks;
 
-public static class CustomChannelTest
+public class CustomChannelTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void CustomChannel_Sync_Open_Close_Methods_Called()
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/MessageTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/MessageTest.cs
index b3f455ee915..2b6177092d0 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/MessageTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/MessageTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class MessageTest
+public class MessageTest : ConditionalWcfTest
 {
     private const string s_action = "http://tempuri.org/someserviceendpoint";
 
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/TextMessageEncodingBindingElementTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/TextMessageEncodingBindingElementTest.cs
index 10f5afb9ee6..367a3385746 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/TextMessageEncodingBindingElementTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/TextMessageEncodingBindingElementTest.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TextMessageEncodingBindingElementTest
+public class TextMessageEncodingBindingElementTest : ConditionalWcfTest
 {
     [WcfFact]
     // Create a TextMessageEncodingBindingElement and check it's default encoding is as expected.
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/TransportBindingElementTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/TransportBindingElementTest.cs
index 8290583d99e..531e3206ba0 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/TransportBindingElementTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/TransportBindingElementTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TransportBindingElementTest
+public class TransportBindingElementTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void GetSet_MaxBufferPoolSize()
diff --git a/src/System.ServiceModel.Primitives/tests/Channels/UnderstoodHeadersTest.cs b/src/System.ServiceModel.Primitives/tests/Channels/UnderstoodHeadersTest.cs
index d26f628feb6..0ed5c5e5bb2 100644
--- a/src/System.ServiceModel.Primitives/tests/Channels/UnderstoodHeadersTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Channels/UnderstoodHeadersTest.cs
@@ -10,7 +10,7 @@
 using System.ServiceModel.Channels;
 using Xunit;
 
-public static class UnderstoodHeadersTest
+public class UnderstoodHeadersTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void UnderstoodHeaders_Add_Contains_Remove_GetEnumerator()
diff --git a/src/System.ServiceModel.Primitives/tests/Description/ContractDescriptionTest.cs b/src/System.ServiceModel.Primitives/tests/Description/ContractDescriptionTest.cs
index 9f464bb5a0f..dc78889ccc1 100644
--- a/src/System.ServiceModel.Primitives/tests/Description/ContractDescriptionTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Description/ContractDescriptionTest.cs
@@ -12,7 +12,7 @@
 using TestTypes;
 using Xunit;
 
-public static class ContractDescriptionTest
+public class ContractDescriptionTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Manually_Generated_Service_Type()
diff --git a/src/System.ServiceModel.Primitives/tests/Description/OperationBehaviorTest.cs b/src/System.ServiceModel.Primitives/tests/Description/OperationBehaviorTest.cs
index e355fc4a380..badaaa42429 100644
--- a/src/System.ServiceModel.Primitives/tests/Description/OperationBehaviorTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Description/OperationBehaviorTest.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class OperationBehaviorTest
+public class OperationBehaviorTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void IOperationBehavior_Methods_AreCalled()
diff --git a/src/System.ServiceModel.Primitives/tests/Description/OperationContractAttributeTest.cs b/src/System.ServiceModel.Primitives/tests/Description/OperationContractAttributeTest.cs
index eb77860ddaa..5aec4f73f6b 100644
--- a/src/System.ServiceModel.Primitives/tests/Description/OperationContractAttributeTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Description/OperationContractAttributeTest.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class OperationContractAttributeTest
+public class OperationContractAttributeTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Default_Ctor_Initializes_Correctly()
diff --git a/src/System.ServiceModel.Primitives/tests/Description/SecurityCredentialsManagerTest.cs b/src/System.ServiceModel.Primitives/tests/Description/SecurityCredentialsManagerTest.cs
index 5b0662030fb..c6820905a0c 100644
--- a/src/System.ServiceModel.Primitives/tests/Description/SecurityCredentialsManagerTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Description/SecurityCredentialsManagerTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class SecurityCredentialsManagerTest
+public class SecurityCredentialsManagerTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Derivable()
diff --git a/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenManagerTest.cs b/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenManagerTest.cs
index fc1088105a6..d47debe25ec 100644
--- a/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenManagerTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenManagerTest.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class SecurityTokenManagerTest
+public class SecurityTokenManagerTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Methods_Override()
diff --git a/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenProviderTest.cs b/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenProviderTest.cs
index ac603893f97..7f4204bb817 100644
--- a/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenProviderTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenProviderTest.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class SecurityTokenProviderTest
+public class SecurityTokenProviderTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void SynchronousImplementationOnly()
diff --git a/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenSerializerTest.cs b/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenSerializerTest.cs
index ba165678a2c..4454649c16e 100644
--- a/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenSerializerTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/IdentityModel/SecurityTokenSerializerTest.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class SecurityTokenSerializerTest
+public class SecurityTokenSerializerTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Methods_NonNullParam_InvokeAndReturn()
diff --git a/src/System.ServiceModel.Primitives/tests/IdentityModel/SymmetricSecurityKeyTest.cs b/src/System.ServiceModel.Primitives/tests/IdentityModel/SymmetricSecurityKeyTest.cs
index 2ddcd6b84f7..f09360fab56 100644
--- a/src/System.ServiceModel.Primitives/tests/IdentityModel/SymmetricSecurityKeyTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/IdentityModel/SymmetricSecurityKeyTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class SymmetricSecurityKeyTest
+public class SymmetricSecurityKeyTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void method_GetSymmetricKey()
diff --git a/src/System.ServiceModel.Primitives/tests/Security/SecurityNegotiationExceptionTest.cs b/src/System.ServiceModel.Primitives/tests/Security/SecurityNegotiationExceptionTest.cs
index 4aef0ab2d4a..ce2aaa84906 100644
--- a/src/System.ServiceModel.Primitives/tests/Security/SecurityNegotiationExceptionTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Security/SecurityNegotiationExceptionTest.cs
@@ -11,7 +11,7 @@
 using TestTypes;
 using Xunit;
 
-public static class SecurityNegotiationExceptionTest
+public class SecurityNegotiationExceptionTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void ValidateConstructors()
diff --git a/src/System.ServiceModel.Primitives/tests/Security/SecurityTokenRequirementTest.cs b/src/System.ServiceModel.Primitives/tests/Security/SecurityTokenRequirementTest.cs
index f1b88347bb4..283f5885e5f 100644
--- a/src/System.ServiceModel.Primitives/tests/Security/SecurityTokenRequirementTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Security/SecurityTokenRequirementTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class SecurityTokenRequirementTest
+public class SecurityTokenRequirementTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void TokenType_DefaultValueIsSameAsNetFramework()
diff --git a/src/System.ServiceModel.Primitives/tests/Security/SecurityUtilsTest.cs b/src/System.ServiceModel.Primitives/tests/Security/SecurityUtilsTest.cs
index 59fb486618c..d35d1878bb7 100644
--- a/src/System.ServiceModel.Primitives/tests/Security/SecurityUtilsTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Security/SecurityUtilsTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class SecurityUtilsTest
+public class SecurityUtilsTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void FixNetworkCredential_AppContext_EnableLegacyUpnUsernameFix()
diff --git a/src/System.ServiceModel.Primitives/tests/Security/securityKeyTest.cs b/src/System.ServiceModel.Primitives/tests/Security/securityKeyTest.cs
index ccaea194663..7e599647aa8 100644
--- a/src/System.ServiceModel.Primitives/tests/Security/securityKeyTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/Security/securityKeyTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class SecurityKeyTest
+public class SecurityKeyTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Property_KeySize_Get()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/ChannelFactoryTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/ChannelFactoryTest.cs
index af6b196a278..e9ba063e1e7 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/ChannelFactoryTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/ChannelFactoryTest.cs
@@ -12,7 +12,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class ChannelFactoryTest
+public class ChannelFactoryTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void CreateChannel_Of_IRequestChannel_Using_CustomBinding()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/ClientBaseTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/ClientBaseTest.cs
index bc88ab55a69..f61d55598e9 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/ClientBaseTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/ClientBaseTest.cs
@@ -10,7 +10,7 @@
 using Xunit;
 using System.Threading.Tasks;
 
-public static partial class ClientBaseTest
+public partial class ClientBaseTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void ClientBaseCloseMethodClosesCorrectly()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/DeliveryRequirementsTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/DeliveryRequirementsTest.cs
index a17184816cd..786bf6bc42e 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/DeliveryRequirementsTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/DeliveryRequirementsTest.cs
@@ -7,7 +7,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class DeliveryRequirementsTest
+public class DeliveryRequirementsTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void OrderedRequired_OrderedSession_NoThrow()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexChannelFactoryTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexChannelFactoryTest.cs
index c69b53f4378..71e5aaa6ce8 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexChannelFactoryTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexChannelFactoryTest.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class DuplexChannelFactoryTest
+public class DuplexChannelFactoryTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void CreateChannel_EndpointAddress_Null_Throws()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexClientBaseTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexClientBaseTest.cs
index a629e698121..01451822cdb 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexClientBaseTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/DuplexClientBaseTest.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class DuplexClientBaseTest
+public class DuplexClientBaseTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void DuplexClientBase_Ctor_Initializes_State()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/ExtensionCollection.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/ExtensionCollection.cs
index cf61ef10e51..fbcf46945d5 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/ExtensionCollection.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/ExtensionCollection.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class ExtensionCollectionTest
+public class ExtensionCollectionTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void ExtensionCollectionPublicMembersTest()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/FaultExceptionTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/FaultExceptionTest.cs
index 8cc440a0f4e..ba81f45e164 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/FaultExceptionTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/FaultExceptionTest.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class FaultExceptionTest
+public class FaultExceptionTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_TDetail_FaultReason()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.4.4.0.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.4.4.0.cs
index b2575cc692e..2c4b6458546 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.4.4.0.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.4.4.0.cs
@@ -12,7 +12,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class MessageContractTest_4_4_0
+public class MessageContractTest_4_4_0 : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(true)]
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.cs
index 31da89f9216..440bde2e78c 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/MessageContractTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class MessageContractTest
+public class MessageContractTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Default_Ctor_Initializes_Properties()
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/SynchronizedCollection.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/SynchronizedCollection.cs
index 97592b0e55e..0e7aa32560b 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/SynchronizedCollection.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/SynchronizedCollection.cs
@@ -7,7 +7,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public class SynchronizedCollectionTest
+public class SynchronizedCollectionTest : ConditionalWcfTest
 {
     [WcfFact]
     // This Unit test is based from full framework test
diff --git a/src/System.ServiceModel.Primitives/tests/ServiceModel/TypedMessageConverterTest.cs b/src/System.ServiceModel.Primitives/tests/ServiceModel/TypedMessageConverterTest.cs
index 1933a73db39..1be441ebe57 100644
--- a/src/System.ServiceModel.Primitives/tests/ServiceModel/TypedMessageConverterTest.cs
+++ b/src/System.ServiceModel.Primitives/tests/ServiceModel/TypedMessageConverterTest.cs
@@ -7,7 +7,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class TypedMessageConverterTest
+public class TypedMessageConverterTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Default_Create()
diff --git a/src/System.ServiceModel.UnixDomainSocket/tests/Channels/UnixDomainSocketTransportBindingElementTest.cs b/src/System.ServiceModel.UnixDomainSocket/tests/Channels/UnixDomainSocketTransportBindingElementTest.cs
index 0728695f2bb..0d61bbd5a7e 100644
--- a/src/System.ServiceModel.UnixDomainSocket/tests/Channels/UnixDomainSocketTransportBindingElementTest.cs
+++ b/src/System.ServiceModel.UnixDomainSocket/tests/Channels/UnixDomainSocketTransportBindingElementTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class UnixDomainSocketTransportBindingElementTest
+public class UnixDomainSocketTransportBindingElementTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Properties()
diff --git a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketBindingTest.cs b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketBindingTest.cs
index 851af53c8be..009f4fe86a6 100644
--- a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketBindingTest.cs
+++ b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketBindingTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class UnixDomainSocketBindingTest
+public class UnixDomainSocketBindingTest : ConditionalWcfTest
 {
     [WcfTheory]
     [InlineData(UnixDomainSocketSecurityMode.None)]
diff --git a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketSecurityTest.cs b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketSecurityTest.cs
index 284d3d7b35e..f3df329548a 100644
--- a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketSecurityTest.cs
+++ b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketSecurityTest.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class UnixDomainSocketSecurityTest
+public class UnixDomainSocketSecurityTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Initializes_Properties()
diff --git a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketTransportSecurityTest.cs b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketTransportSecurityTest.cs
index 4015a19cc12..e9604587162 100644
--- a/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketTransportSecurityTest.cs
+++ b/src/System.ServiceModel.UnixDomainSocket/tests/ServiceModel/UnixDomainSocketTransportSecurityTest.cs
@@ -8,7 +8,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class UnixDomainSocketTransportSecurityTest
+public class UnixDomainSocketTransportSecurityTest : ConditionalWcfTest
 {
     [WcfFact]
     public static void Ctor_Default_Properties()