diff --git a/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs b/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs
index 9218b4adec2d2..b1c083cdc1e9a 100644
--- a/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs
+++ b/src/EditorFeatures/Test/Extensions/SourceTextContainerExtensionsTests.cs
@@ -28,7 +28,8 @@ public void GetBufferTextFromTextContainerDoesNotThrow()
             var textSnapshotMock = new Mock<VisualStudio.Text.ITextSnapshot2>();
             var bufferMock = new Mock<VisualStudio.Text.ITextBuffer>();
 
-            textSnapshotMock.Setup(s => s.TextImage).Returns(textImageMock.Object);
+            textSnapshotMock.SetupGet(s => s.TextImage).Returns(textImageMock.Object);
+            textSnapshotMock.SetupGet(s => s.TextBuffer).Returns(bufferMock.Object);
             bufferMock.SetupGet(x => x.CurrentSnapshot).Returns(textSnapshotMock.Object);
             bufferMock.SetupGet(x => x.Properties).Returns(new VisualStudio.Utilities.PropertyCollection());
 
diff --git a/src/EditorFeatures/Test/TextEditor/TryGetDocumentTests.cs b/src/EditorFeatures/Test/TextEditor/TryGetDocumentTests.cs
index f9afa125c6a18..1af79f3b4bee6 100644
--- a/src/EditorFeatures/Test/TextEditor/TryGetDocumentTests.cs
+++ b/src/EditorFeatures/Test/TextEditor/TryGetDocumentTests.cs
@@ -71,10 +71,14 @@ public void EmptyTextChanges()
                 Assert.True(buffer.CurrentSnapshot.Version.ReiteratedVersionNumber == 1);
 
                 var newText = buffer.CurrentSnapshot.AsText();
-                Assert.Same(text, newText);
+
+                // different buffer snapshot should never return same roslyn text snapshot
+                Assert.NotSame(text, newText);
 
                 Document newDocument = newText.GetRelatedDocumentsWithChanges().First();
-                Assert.Same(document, newDocument);
+
+                // different text snapshot never gives back same roslyn snapshot
+                Assert.NotSame(document, newDocument);
             }
         }
     }