diff --git a/Src/Compilers/Core/Source/CodeAnalysis.csproj b/Src/Compilers/Core/Source/CodeAnalysis.csproj
index bfdb94f962344972d5ebfb85e03b5eff9f227eb3..6b743e15f589dd25d778832a3931015226ecd4c0 100644
--- a/Src/Compilers/Core/Source/CodeAnalysis.csproj
+++ b/Src/Compilers/Core/Source/CodeAnalysis.csproj
@@ -645,6 +645,7 @@
     <InternalsVisibleToTest Include="Roslyn.Diagnostics.CodeFixes.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
diff --git a/Src/Compilers/VisualBasic/Source/BasicCodeAnalysis.vbproj b/Src/Compilers/VisualBasic/Source/BasicCodeAnalysis.vbproj
index 0bbca6bf518743732f7ba7587a9439fad7dc5a94..21cb57e84a718adc6b5c7e4c20a7fdf57069234d 100644
--- a/Src/Compilers/VisualBasic/Source/BasicCodeAnalysis.vbproj
+++ b/Src/Compilers/VisualBasic/Source/BasicCodeAnalysis.vbproj
@@ -966,7 +966,8 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Syntax.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Test.Utilities2" />
-    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.Scripting.Common.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
diff --git a/Src/Compilers/VisualBasic/Source/Compilation/MethodCompiler.vb b/Src/Compilers/VisualBasic/Source/Compilation/MethodCompiler.vb
index 66ef989ed82727b56542e14aa8857067faef5299..a0de045baa923476cabc8b5ac7b8a6cdba80c0e1 100644
--- a/Src/Compilers/VisualBasic/Source/Compilation/MethodCompiler.vb
+++ b/Src/Compilers/VisualBasic/Source/Compilation/MethodCompiler.vb
@@ -782,7 +782,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
                     Dim emittedBody = GenerateMethodBody(_moduleBeingBuilt,
                                                          method,
                                                          boundBody,
-                                                         optimize:=True,
+                                                         optimize:=_compilation.Options.Optimize,
                                                          debugDocumentProvider:=Nothing,
                                                          diagsForThisMethod:=diagnosticsThisMethod,
                                                          namespaceScopes:=Nothing)
diff --git a/Src/Test/Utilities/TestUtilities.csproj b/Src/Test/Utilities/TestUtilities.csproj
index 357706b72397db8b0207f70aeb0020273e1e9b29..88647d9de3e7ef4a26f5707b669b6972fc314cd1 100644
--- a/Src/Test/Utilities/TestUtilities.csproj
+++ b/Src/Test/Utilities/TestUtilities.csproj
@@ -183,6 +183,7 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.CSharp.ResultProvider.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.ExpressionCompiler.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ExpressionCompiler.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.ExpressionEvaluator.VisualBasic.ResultProvider.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />