diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
index f02fd4f609..737129604c 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestExecutionManagerTests.cs
@@ -868,7 +868,7 @@ private void SetTestCaseProperties(TestCase testCase, object[] propertiesValue)
 
         #region Dummy implementation
 
-        [UTF.TestClass]
+        [DummyTestClass]
         internal class DummyTestClass
         {
             public static IDictionary<string, object> TestContextProperties
@@ -901,7 +901,7 @@ public void IgnoredTest()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithCleanupMethods
         {
             [UTF.ClassCleanup]
@@ -916,7 +916,7 @@ public void TestMethod()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassForParallelize
         {
             private static HashSet<int> threadIds = new HashSet<int>();
@@ -951,7 +951,7 @@ public void TestMethod2()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassForParallelize2
         {
             private static HashSet<int> threadIds = new HashSet<int>();
@@ -982,7 +982,7 @@ public void TestMethod2()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassForParallelize3
         {
             private static HashSet<int> threadIds = new HashSet<int>();
@@ -1007,7 +1007,7 @@ public void TestMethod1()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithDoNotParallelizeMethods
         {
             private static HashSet<int> parallelizableTestsThreadIds = new HashSet<int>();
@@ -1096,6 +1096,10 @@ public void TestMethod4()
             }
         }
 
+        private class DummyTestClassAttribute : UTF.TestClassAttribute
+        {
+        }
+
         #endregion
     }
 
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodFilterTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodFilterTests.cs
index a53d5ddc45..31dac97d28 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodFilterTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TestMethodFilterTests.cs
@@ -194,7 +194,7 @@ public void GetFilterExpressionForDiscoveryContextWithGetTestCaseFilterThrowingE
             Assert.AreEqual(TestMessageLevel.Error, recorder.TestMessageLevel);
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         internal class DummyTestClassWithTestMethods
         {
             public UTFExtension.TestContext TestContext { get; set; }
@@ -282,5 +282,9 @@ public bool MatchTestCase(TestCase testCase, Func<string, object> propertyValueP
                 throw new NotImplementedException();
             }
         }
+
+        private class DummyTestClassAttribute : UTF.TestClassAttribute
+        {
+        }
     }
 }
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs
index 3943a84714..db1c33b763 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/TypeCacheTests.cs
@@ -1236,7 +1236,7 @@ private void SetupMocks()
 
         #region dummy implementations
 
-        [UTF.TestClass]
+        [DummyTestClass]
         internal class DummyTestClassWithTestMethods
         {
             public UTFExtension.TestContext TestContext { get; set; }
@@ -1308,7 +1308,7 @@ public void TestMethodWithMultipleExpectedException()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         internal class DerivedTestClass : BaseTestClass
         {
         }
@@ -1343,7 +1343,7 @@ private class DummyTestClassWithMultipleTestContextProperties : DummyTestClassWi
         {
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithInitializeMethods
         {
             public static void AssemblyInit(UTFExtension.TestContext tc)
@@ -1355,7 +1355,7 @@ public void TestInit()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithCleanupMethods
         {
             public static void AssemblyCleanup()
@@ -1367,7 +1367,7 @@ public void TestCleanup()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyDerivedTestClassWithInitializeMethods : DummyTestClassWithInitializeMethods
         {
             public void TestMehtod()
@@ -1375,7 +1375,7 @@ public void TestMehtod()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyDerivedTestClassWithCleanupMethods : DummyTestClassWithCleanupMethods
         {
             public void TestMehtod()
@@ -1383,7 +1383,7 @@ public void TestMehtod()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithInitAndCleanupMethods
         {
             public static void AssemblyInit(UTFExtension.TestContext tc)
@@ -1399,7 +1399,7 @@ public void TestInitOrCleanup()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithIncorrectInitializeMethods
         {
             public static void TestInit(int i)
@@ -1411,7 +1411,7 @@ public void AssemblyInit(UTFExtension.TestContext tc)
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithIncorrectCleanupMethods
         {
             public static void TestCleanup(int i)
@@ -1423,7 +1423,7 @@ public void AssemblyCleanup()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithIncorrectTestMethodSignatures
         {
             public static void TestMethod()
@@ -1435,6 +1435,10 @@ private class DerivedTestMethodAttribute : UTF.TestMethodAttribute
         {
         }
 
+        private class DummyTestClassAttribute : UTF.TestClassAttribute
+        {
+        }
+
         #endregion
     }
 }
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestRunnerTests.cs b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestRunnerTests.cs
index 0c47758f87..2119f6438a 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestRunnerTests.cs
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/Execution/UnitTestRunnerTests.cs
@@ -346,7 +346,7 @@ private MSTestSettings GetSettingsWithDebugTrace(bool captureDebugTraceValue)
 
         #region Dummmy implementations
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClass
         {
             public UTFExtension.TestContext TestContext { get; set; }
@@ -358,7 +358,7 @@ public void TestMethodToTestInProgress()
             }
         }
 
-        [UTF.TestClass]
+        [DummyTestClass]
         private class DummyTestClassWithInitializeMethods
         {
             public static Action AssemblyInitializeMethodBody { get; set; }
@@ -412,6 +412,10 @@ public void TestMethod()
             }
         }
 
+        private class DummyTestClassAttribute : UTF.TestClassAttribute
+        {
+        }
+
         #endregion
     }
 }
