diff --git a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
index e1a7c836bc551a11905bad9ca9d42f16a6ba3df2..d5a72da0257869438b606350d3274ebd48f19d2a 100644
--- a/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
+++ b/src/Compilers/CSharp/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.cs
@@ -3775,8 +3775,7 @@ .maxstack  1
         /// Reuse existing anonymous types.
         /// </summary>
         [WorkItem(825903, "DevDiv")]
-        [Fact]
-        [Trait("Require32", "true")]
+        [ConditionalFact(typeof(x86))]
         public void AnonymousTypes()
         {
             var source0 =
diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueTests.vb
index b47a19fef9123d4f4b784af95d6af1fde8bae561..e6b98fb376f2bae6e0b151d5e87b92afead8914a 100644
--- a/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueTests.vb
+++ b/src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinueTests.vb
@@ -3276,8 +3276,7 @@ End Class
 ]]>.Value)
         End Sub
 
-        <Fact()>
-        <Trait("Require32", "true")>
+        <ConditionalFact(GetType(x86))>
         Public Sub AnonymousTypes()
             Dim sources0 = <compilation>
                                <file name="a.vb"><![CDATA[
diff --git a/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Expressions_Tests.vb b/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Expressions_Tests.vb
index b77fe899b0f8cf3f622f7f7127317a7fd07d11a7..4edbfaeaebd16dbdd9ed4ef6fbde02718d60754a 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Expressions_Tests.vb
+++ b/src/Compilers/VisualBasic/Test/Semantic/Binding/Binder_Expressions_Tests.vb
@@ -3017,8 +3017,7 @@ End Class
         End Sub
 
         <WorkItem(1108007, "DevDiv")>
-        <Fact()>
-        <Trait("Require32", "true")>
+        <ConditionalFact(GetType(x86))>
         Public Sub Bug1108007_2()
             Dim compilation = CompilationUtils.CreateCompilationWithMscorlibAndVBRuntime(
 <compilation>
@@ -3320,8 +3319,7 @@ End Class
         End Sub
 
         <WorkItem(1108007, "DevDiv")>
-        <Fact()>
-        <Trait("Require32", "true")>
+        <ConditionalFact(GetType(x86))>
         Public Sub Bug1108007_8()
             Dim compilation = CompilationUtils.CreateCompilationWithMscorlibAndVBRuntime(
 <compilation>
diff --git a/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs b/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs
index 9e681f1b03df82ce5bc330d041e68e714ec9f6d3..a592656b6d4f8d2ac856adcb62d03665822ae79c 100644
--- a/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs
+++ b/src/EditorFeatures/Test/CodeFixes/ExtensionOrderingTests.cs
@@ -16,8 +16,7 @@ public class ExtensionOrderingTests
     {
         private readonly ExportProvider _exportProvider = TestExportProvider.ExportProviderWithCSharpAndVisualBasic;
 
-        [Fact]
-        [Trait("Require32", "true")]
+        [ConditionalFact(typeof(x86))]
         public void TestNoCyclesInFixProviders()
         {
             // This test will fail if a cycle is detected in the ordering of our code fix providers.
diff --git a/src/Tools/Source/RunTests/Program.cs b/src/Tools/Source/RunTests/Program.cs
index 1930115338548c99f6c160f42df415bc4ea0ece0..a6a0f9f7fef6d2735f12eb820d0c15757478251f 100644
--- a/src/Tools/Source/RunTests/Program.cs
+++ b/src/Tools/Source/RunTests/Program.cs
@@ -39,7 +39,7 @@ internal static int Main(string[] args)
                 ? Path.Combine(xunitPath, "xunit.console.exe")
                 : Path.Combine(xunitPath, "xunit.console.x86.exe");
 
-            var testRunner = new TestRunner(xunit, test64);
+            var testRunner = new TestRunner(xunit);
             var start = DateTime.Now;
             Console.WriteLine("Running {0} tests", list.Count);
             var result = testRunner.RunAll(list).Result;
diff --git a/src/Tools/Source/RunTests/TestRunner.cs b/src/Tools/Source/RunTests/TestRunner.cs
index c28cc37bbb01f95f94233782a2ed688ab2d3ae97..19e511c29b482b4f0befc4ca531c9683e9cdf483 100644
--- a/src/Tools/Source/RunTests/TestRunner.cs
+++ b/src/Tools/Source/RunTests/TestRunner.cs
@@ -31,12 +31,10 @@ internal TestResult(bool succeeded, string assemblyName, TimeSpan elapsed, strin
         }
 
         private readonly string _xunitConsolePath;
-        private readonly bool _use64;
 
-        internal TestRunner(string xunitConsolePath, bool use64)
+        internal TestRunner(string xunitConsolePath)
         {
             _xunitConsolePath = xunitConsolePath;
-            _use64 = use64;
         }
 
         internal async Task<bool> RunAll(IEnumerable<string> assemblyList)
@@ -108,14 +106,10 @@ private async Task<TestResult> RunTest(string assemblyPath)
         {
             var assemblyName = Path.GetFileName(assemblyPath);
             var resultsPath = Path.Combine(Path.GetDirectoryName(assemblyPath), Path.ChangeExtension(assemblyName, ".html"));
+            DeleteFile(resultsPath);
+
             var builder = new StringBuilder();
             builder.AppendFormat(@"""{0}""", assemblyPath);
-
-            if (_use64)
-            {
-                builder.Append(@" -notrait ""Require32=true""");
-            }
-
             builder.AppendFormat(@" -html ""{0}""", resultsPath);
             builder.Append(" -noshadow");
 
@@ -163,5 +157,20 @@ private async Task<TestResult> RunTest(string assemblyPath)
 
             return new TestResult(processOutput.ExitCode == 0, assemblyName, span, errorOutput);
         }
+
+        private static void DeleteFile(string filePath)
+        {
+            try
+            {
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);
+                }
+            }
+            catch
+            {
+                // Ignore
+            }
+        }
     }
 }