diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee
index c7acbfa26..6c3b17f56 100644
--- a/spec/display-buffer-spec.coffee
+++ b/spec/display-buffer-spec.coffee
@@ -47,14 +47,6 @@ describe "DisplayBuffer", ->
       buffer.insert([0, 0], oneHundredLines)
       expect(displayBuffer.getLineCount()).toBe 100 + originalLineCount
 
-    it "reassigns the scrollTop if it exceeds the max possible value after lines are removed", ->
-      displayBuffer.setHeight(50)
-      displayBuffer.setLineHeightInPixels(10)
-      displayBuffer.setScrollTop(80)
-
-      buffer.delete([[8, 0], [10, 0]])
-      expect(displayBuffer.getScrollTop()).toBe 60
-
     it "updates the display buffer prior to invoking change handlers registered on the buffer", ->
       buffer.onDidChange -> expect(displayBuffer2.tokenizedLineForScreenRow(0).text).toBe "testing"
       displayBuffer2 = new DisplayBuffer({buffer, tabLength})
@@ -296,18 +288,6 @@ describe "DisplayBuffer", ->
         displayBuffer.setEditorWidthInChars(-1)
         expect(displayBuffer.editorWidthInChars).not.toBe -1
 
-    it "sets ::scrollLeft to 0 and keeps it there when soft wrapping is enabled", ->
-      displayBuffer.setDefaultCharWidth(10)
-      displayBuffer.setWidth(85)
-
-      displayBuffer.setSoftWrapped(false)
-      displayBuffer.setScrollLeft(Infinity)
-      expect(displayBuffer.getScrollLeft()).toBeGreaterThan 0
-      displayBuffer.setSoftWrapped(true)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-      displayBuffer.setScrollLeft(10)
-      expect(displayBuffer.getScrollLeft()).toBe 0
-
   describe "primitive folding", ->
     beforeEach ->
       displayBuffer.destroy()
diff --git a/spec/text-editor-presenter-spec.coffee b/spec/text-editor-presenter-spec.coffee
index 8db6fa90b..6d5f4a13d 100644
--- a/spec/text-editor-presenter-spec.coffee
+++ b/spec/text-editor-presenter-spec.coffee
@@ -365,6 +365,18 @@ describe "TextEditorPresenter", ->
           expectStateUpdate presenter, -> presenter.setScrollLeft(-300)
           expect(presenter.getState().horizontalScrollbar.scrollLeft).toBe 0
 
+        it "is always 0 when soft wrapping is enabled", ->
+          presenter = buildPresenter(scrollLeft: 0, verticalScrollbarWidth: 0, contentFrameWidth: 85, baseCharacterWidth: 10)
+
+          editor.setSoftWrapped(false)
+          presenter.setScrollLeft(Infinity)
+          expect(presenter.getState().content.scrollLeft).toBeGreaterThan 0
+
+          editor.setSoftWrapped(true)
+          expect(presenter.getState().content.scrollLeft).toBe 0
+          presenter.setScrollLeft(10)
+          expect(presenter.getState().content.scrollLeft).toBe 0
+
     describe ".verticalScrollbar", ->
       describe ".visible", ->
         it "is true if the scrollHeight exceeds the computed client height", ->
@@ -682,6 +694,12 @@ describe "TextEditorPresenter", ->
           expectStateUpdate presenter, -> presenter.setScrollTop(50)
           expect(presenter.getState().content.scrollTop).toBe 50
 
+        it "reassigns the scrollTop if it exceeds the max possible value after lines are removed", ->
+          presenter = buildPresenter(scrollTop: 80, lineHeight: 10, explicitHeight: 50, horizontalScrollbarHeight: 0)
+          expect(presenter.getState().content.scrollTop).toBe(80)
+          buffer.deleteRows(10, 9, 8)
+          expect(presenter.getState().content.scrollTop).toBe(60)
+
         it "is always rounded to the nearest integer", ->
           presenter = buildPresenter(scrollTop: 10, lineHeight: 10, explicitHeight: 20)
           expect(presenter.getState().content.scrollTop).toBe 10