diff --git a/spec/app/selection-spec.coffee b/spec/app/selection-spec.coffee
index d79e0919a..1d53e50be 100644
--- a/spec/app/selection-spec.coffee
+++ b/spec/app/selection-spec.coffee
@@ -1,38 +1,35 @@
 Buffer = require 'buffer'
-Editor = require 'editor'
+EditSession = require 'edit-session'
 Range = require 'range'
 
 describe "Selection", ->
-  [editor, buffer, selectionView, selection] = []
+  [buffer, selection] = []
 
   beforeEach ->
     buffer = new Buffer(require.resolve('fixtures/sample.js'))
-    editor = new Editor
-    editor.enableKeymap()
-    editor.setBuffer(buffer)
-    editor.isFocused = true
-    editor.attachToDom()
-
-    selectionView = editor.getSelectionView()
-    selection = editor.getSelection()
+    fakeEditor =
+      calcSoftWrapColumn: ->
+      tabText: '  '
+    editSession = new EditSession(editor: fakeEditor, buffer: buffer)
+    selection = editSession.getSelection()
 
   describe ".deleteSelectedText()", ->
     describe "when nothing is selected", ->
       it "deletes nothing", ->
         selection.setBufferRange new Range([0,3], [0,3])
         selection.deleteSelectedText()
-        expect(editor.buffer.lineForRow(0)).toBe "var quicksort = function () {"
+        expect(buffer.lineForRow(0)).toBe "var quicksort = function () {"
 
     describe "when one line is selected", ->
       it "deletes selected text and clears the selection", ->
         selection.setBufferRange new Range([0,4], [0,14])
         selection.deleteSelectedText()
-        expect(editor.buffer.lineForRow(0)).toBe "var = function () {"
+        expect(buffer.lineForRow(0)).toBe "var = function () {"
 
-        endOfLine = editor.buffer.lineForRow(0).length
+        endOfLine = buffer.lineForRow(0).length
         selection.setBufferRange new Range([0,0], [0, endOfLine])
         selection.deleteSelectedText()
-        expect(editor.buffer.lineForRow(0)).toBe ""
+        expect(buffer.lineForRow(0)).toBe ""
 
         expect(selection.isEmpty()).toBeTruthy()
 
@@ -40,21 +37,18 @@ describe "Selection", ->
       it "deletes selected text and clears the selection", ->
         selection.setBufferRange new Range([0,1], [2,39])
         selection.deleteSelectedText()
-        expect(editor.buffer.lineForRow(0)).toBe "v;"
+        expect(buffer.lineForRow(0)).toBe "v;"
         expect(selection.isEmpty()).toBeTruthy()
 
     describe "when the cursor precedes the anchor", ->
       it "it deletes selected text and clears the selection", ->
-        editor.attachToDom()
         selection.cursor.setScreenPosition [0,13]
         selection.selectToScreenPosition [0,4]
 
         selection.delete()
-        expect(editor.buffer.lineForRow(0)).toBe "var  = function () {"
+        expect(buffer.lineForRow(0)).toBe "var  = function () {"
         expect(selection.isEmpty()).toBeTruthy()
 
-        expect(selectionView.find('.selection')).not.toExist()
-
   describe ".isReversed()", ->
     it "returns true if the cursor precedes the anchor", ->
       selection.cursor.setScreenPosition([0, 20])