diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/EditorInProcess.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/EditorInProcess.cs
index b08970b4e09dd..e09383278e11f 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/EditorInProcess.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/EditorInProcess.cs
@@ -566,7 +566,14 @@ private async Task<List<ComboBox>> GetNavigationBarComboBoxesAsync(IWpfTextView
         await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
         var margin = await GetNavigationBarMarginAsync(textView, cancellationToken);
-        return margin.GetFieldValue<List<ComboBox>>("_combos");
+        try
+        {
+            return margin.GetFieldValue<List<ComboBox>>("_combos");
+        }
+        catch (FieldAccessException)
+        {
+            return margin.GetFieldValue<List<ComboBox>>("Combos");
+        }
     }
 
     private async Task<UIElement?> GetNavigationBarMarginAsync(IWpfTextView textView, CancellationToken cancellationToken)
diff --git a/src/Workspaces/CoreTestUtilities/ObjectExtensions.cs b/src/Workspaces/CoreTestUtilities/ObjectExtensions.cs
index db2efe35a5ea0..7448098599a9f 100644
--- a/src/Workspaces/CoreTestUtilities/ObjectExtensions.cs
+++ b/src/Workspaces/CoreTestUtilities/ObjectExtensions.cs
@@ -46,7 +46,7 @@ public static object GetFieldValue(this object instance, string fieldName)
 
             if (fieldInfo == null)
             {
-                throw new FieldAccessException("Field " + fieldName + " was not found on type " + type.ToString());
+                throw new FieldAccessException($"Field '{fieldName}' was not found on type '{instance.GetType()}'");
             }
 
             var result = fieldInfo.GetValue(instance);