diff --git a/src/tests/JIT/Methodical/cctor/misc/assemname.cs b/src/tests/JIT/Methodical/cctor/misc/assemname.cs
index f83108c2c2ec52..0bd4d577514d8f 100644
--- a/src/tests/JIT/Methodical/cctor/misc/assemname.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/assemname.cs
@@ -7,7 +7,7 @@
 
 namespace Precise
 {
-    internal class Driver
+    internal class Driver_assemname
     {
         public static int Main()
         {
diff --git a/src/tests/JIT/Methodical/cctor/misc/deadlock.il b/src/tests/JIT/Methodical/cctor/misc/deadlock.il
index d3b6e4bc2468f0..0c52d0b8590a11 100644
--- a/src/tests/JIT/Methodical/cctor/misc/deadlock.il
+++ b/src/tests/JIT/Methodical/cctor/misc/deadlock.il
@@ -9,30 +9,31 @@
 }
 .assembly deadlock {}
 .assembly extern xunit.core {}
+.namespace Test_deadlock {
 .class public A extends [mscorlib]System.Object
 {
-.field static public class A a
-.field static public class B b
+.field static public class Test_deadlock.A a
+.field static public class Test_deadlock.B b
 .method public static rtspecialname specialname void .cctor ()
 {
 ldnull
-stsfld class B A::b
-ldsfld class A B::a
-stsfld class A A::a
+stsfld class Test_deadlock.B Test_deadlock.A::b
+ldsfld class Test_deadlock.A Test_deadlock.B::a
+stsfld class Test_deadlock.A Test_deadlock.A::a
 ret
 }
 }
 
 .class public B extends [mscorlib]System.Object
 {
-.field static public class A a
-.field static public class B b
+.field static public class Test_deadlock.A a
+.field static public class Test_deadlock.B b
 .method public static rtspecialname specialname void .cctor ()
 {
 ldnull
-stsfld class A B::a
-ldsfld class B A::b
-stsfld class B B::b
+stsfld class Test_deadlock.A Test_deadlock.B::a
+ldsfld class Test_deadlock.B Test_deadlock.A::b
+stsfld class Test_deadlock.B Test_deadlock.B::b
 ret
 }
 }
@@ -43,8 +44,9 @@ ret
     01 00 00 00
 )
 .entrypoint
-ldsfld class B A::b
+ldsfld class Test_deadlock.B Test_deadlock.A::b
 pop
 ldc.i4 100
 ret
 }
+}
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads1.cs b/src/tests/JIT/Methodical/cctor/misc/threads1.cs
index fc63ecfa6f9539..1f026536a73200 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads1.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/threads1.cs
@@ -8,7 +8,7 @@
 
 namespace Precise
 {
-    internal class Driver
+    internal class Driver_threads1
     {
         public static void f()
         {
diff --git a/src/tests/JIT/Methodical/cctor/misc/threads2.cs b/src/tests/JIT/Methodical/cctor/misc/threads2.cs
index 49ecf79bd8097b..ef08f2d708119c 100644
--- a/src/tests/JIT/Methodical/cctor/misc/threads2.cs
+++ b/src/tests/JIT/Methodical/cctor/misc/threads2.cs
@@ -9,7 +9,7 @@
 
 namespace Precise
 {
-    internal class Driver
+    internal class Driver_threads2
     {
         public static void f()
         {
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs
index 0e3939247f45df..4ce195164d317c 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1.cs
@@ -3,7 +3,7 @@
 // static method
 using System;
 namespace Precise {
-class Driver
+class Driver_xprecise1
 {
 	public static int Main()
 	{
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs
index c230cd25cb1d57..b684fcf87135b4 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise1b.cs
@@ -5,7 +5,7 @@
 using System;
 namespace Precise
 {
-    class Driver
+    class Driver_xprecise1b
     {
         public static int Main()
         {
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs
index 1fcf976357550b..9d3f13ad0e020b 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise2.cs
@@ -5,7 +5,7 @@
 using System;
 namespace Precise
 {
-    class Driver
+    class Driver_xprecise2
     {
         public static int Main()
         {
diff --git a/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs b/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs
index e432c7b20b0856..70d08bd2dfd0ab 100644
--- a/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs
+++ b/src/tests/JIT/Methodical/cctor/xassem/xprecise4.cs
@@ -5,7 +5,7 @@
 using System;
 namespace Precise
 {
-    class Driver
+    class Driver_xprecise4
     {
         public static int Main()
         {