diff --git a/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb b/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb
index 98df09d28bdd7d364cb97e95e95229111d3ba8ad..9775068ae2f4fbbf58525a457c85d22e7d146491 100644
--- a/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb
+++ b/src/EditorFeatures/TestUtilities2/Intellisense/TestCompletionPresenterSession.vb
@@ -16,6 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
         Public SelectedItem As CompletionItem
         Public IsSoftSelected As Boolean
         Public SuggestionModeItem As CompletionItem
+        Public SuggestionMode As Boolean
 
         Public Event Dismissed As EventHandler(Of EventArgs) Implements ICompletionPresenterSession.Dismissed
         Public Event ItemSelected As EventHandler(Of CompletionItemEventArgs) Implements ICompletionPresenterSession.ItemSelected
@@ -40,6 +41,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
             Me.SelectedItem = selectedItem
             Me.IsSoftSelected = isSoftSelected
             Me.SuggestionModeItem = suggestionModeItem
+            Me.SuggestionMode = suggestionMode
             Me._completionFilters = completionItemFilters
         End Sub
 
diff --git a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
index 35a87e62d0d6202a7f077d04854425a68c21c3f6..f8803fb9f4d392ff59588f24b8c57176490357ef 100644
--- a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
@@ -289,19 +289,6 @@ End Class
             Await VerifyBuilderAsync(markup)
         End Function
 
-        <WorkItem(1044441, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1044441")>
-        <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
-        Public Async Function BuilderInDebugger() As Task
-            Dim markup = <a> 
-Class C1
-    Sub Foo()
-        Dim __o = $$
-    End Sub
-End Class
-</a>
-            Await VerifyBuilderAsync(markup, CompletionTrigger.Default, useDebuggerOptions:=True)
-        End Function
-
         <WorkItem(7213, "https://github.com/dotnet/roslyn/issues/7213")>
         <Fact, Trait(Traits.Feature, Traits.Features.Completion)>
         Public Async Function NamespaceDeclarationName_Unqualified() As Task
diff --git a/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb b/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
index 5c1b735cc0e0dfb4aa4aea11f506bcbfac600687..c9a0375914d99931c6c2c0a33e4520a4306d2f75 100644
--- a/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
+++ b/src/VisualStudio/Core/Test/DebuggerIntelliSense/CSharpDebuggerIntellisenseTests.vb
@@ -687,13 +687,13 @@ $$</Document>
                 Await state.WaitForAsynchronousOperationsAsync()
                 Assert.Equal("args", state.GetCurrentViewLineText())
                 Await state.AssertCompletionSession()
-                Assert.NotNull(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.True(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendToggleCompletionMode()
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendTypeChars(".")
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
             End Using
         End Function
 
@@ -717,13 +717,13 @@ $$</Document>
                 Await state.WaitForAsynchronousOperationsAsync()
                 Assert.Equal("args", state.GetCurrentViewLineText())
                 Await state.AssertCompletionSession()
-                Assert.NotNull(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.True(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendToggleCompletionMode()
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
                 state.SendTypeChars(".")
                 Await state.WaitForAsynchronousOperationsAsync()
-                Assert.Null(state.CurrentCompletionPresenterSession.SuggestionModeItem)
+                Assert.False(state.CurrentCompletionPresenterSession.SuggestionMode)
             End Using
         End Function