diff --git a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
index 82ccb62f8048481b586f2f8db7829379ec91f761..ff84fa151ce12b097e330973819cfcde6b5f50a1 100644
--- a/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
+++ b/src/Compilers/Test/Utilities/CSharp/CSharpTestBase.cs
@@ -2034,14 +2034,26 @@ protected static CSharpCompilation CreateCompilationWithIndexAndRangeAndSpan(CSh
 
         #region Theory Helpers
 
-        public static IEnumerable<object[]> NonNullTypesTrueAndFalse
+        public static IEnumerable<object[]> NonNullTypesTrueAndFalseDebugDll
         {
             get
             {
                 return new List<object[]>()
                 {
-                    new object[] { WithNonNullTypesTrue() },
-                    new object[] { WithNonNullTypesFalse() }
+                    new object[] { WithNonNullTypesTrue(TestOptions.DebugDll) },
+                    new object[] { WithNonNullTypesFalse(TestOptions.DebugDll) }
+                };
+            }
+        }
+
+        public static IEnumerable<object[]> NonNullTypesTrueAndFalseReleaseDll
+        {
+            get
+            {
+                return new List<object[]>()
+                {
+                    new object[] { WithNonNullTypesTrue(TestOptions.ReleaseDll) },
+                    new object[] { WithNonNullTypesFalse(TestOptions.ReleaseDll) }
                 };
             }
         }
diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
index 7aebf854a16a3327147210f1ab6ecfb0adba70b6..92d992c0dbcaf00032e0c2da77a94515aa0efb8d 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/LocalsTests.cs
@@ -1628,8 +1628,9 @@ .maxstack  1
         /// Should not include "this" inside display class
         /// instance method if "this" is not captured.
         /// </summary>
-        [Fact]
-        public void NoThisInsideDisplayClassInstanceMethod()
+        [Theory]
+        [MemberData(nameof(NonNullTypesTrueAndFalseDebugDll))]
+        public void NoThisInsideDisplayClassInstanceMethod(CSharpCompilationOptions options)
         {
             var source =
 @"using System;
@@ -1647,7 +1648,7 @@ class C
         f(2)(x);
     }
 }";
-            var compilation0 = CreateCompilation(source, options: TestOptions.DebugDll);
+            var compilation0 = CreateCompilation(source, options: options);
             WithRuntimeInstance(compilation0, runtime =>
             {
                 var context = CreateMethodContext(runtime, "C.<>c__DisplayClass0_0.<M>b__0");
diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ReferencedModulesTests.cs b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ReferencedModulesTests.cs
index ac3ad83ac73115dfe07192624a8ec1a2f840110a..c1d181ecb603a149417d1f725080e322ad445eda 100644
--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ReferencedModulesTests.cs
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ReferencedModulesTests.cs
@@ -1368,7 +1368,7 @@ .maxstack  1
         // References to missing assembly from PDB custom debug info.
         [WorkItem(13275, "https://github.com/dotnet/roslyn/issues/13275")]
         [Theory]
-        [MemberData(nameof(NonNullTypesTrueAndFalse))]
+        [MemberData(nameof(NonNullTypesTrueAndFalseReleaseDll))]
         public void CorLibWithAssemblyReferences_Pdb(CSharpCompilationOptions options)
         {
             string sourceLib =