diff --git a/cms/static/coffee/spec/views/textbook_spec.coffee b/cms/static/coffee/spec/views/textbook_spec.coffee
index eab7065321..2ab0403ff8 100644
--- a/cms/static/coffee/spec/views/textbook_spec.coffee
+++ b/cms/static/coffee/spec/views/textbook_spec.coffee
@@ -264,9 +264,6 @@ describe "CMS.Views.UploadDialog", ->
         setFixtures($("<script>", {id: "upload-dialog-tpl", type: "text/template"}).text(tpl))
         appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
         window.UPLOAD_ASSET_CALLBACK_URL = "/upload"
-        @requests = requests = []
-        @xhr = sinon.useFakeXMLHttpRequest()
-        @xhr.onCreate = (xhr) -> requests.push(xhr)
 
         @model = new CMS.Models.FileUpload()
         @chapter = new CMS.Models.Chapter()
@@ -288,108 +285,83 @@ describe "CMS.Views.UploadDialog", ->
 
     afterEach ->
         delete window.UPLOAD_ASSET_CALLBACK_URL
-        @xhr.restore()
 
-    it "should be shown by default", ->
-        expect(@view.options.shown).toBeTruthy()
+    describe "Basic", ->
+        it "should be shown by default", ->
+            expect(@view.options.shown).toBeTruthy()
 
-    it "should render without a file selected", ->
-        @view.render()
-        expect(@view.$el).toContain("input[type=file]")
-        expect(@view.$(".action-upload")).toBeDisabled()
+        it "should render without a file selected", ->
+            @view.render()
+            expect(@view.$el).toContain("input[type=file]")
+            expect(@view.$(".action-upload")).toBeDisabled()
 
-    it "should render with a PDF selected", ->
-        file = {name: "fake.pdf", "type": "application/pdf"}
-        @mockFiles.push(file)
-        @model.set("selectedFile", file)
-        @view.render()
-        expect(@view.$el).toContain("input[type=file]")
-        expect(@view.$el).not.toContain("p.error")
-        expect(@view.$(".action-upload")).not.toBeDisabled()
+        it "should render with a PDF selected", ->
+            file = {name: "fake.pdf", "type": "application/pdf"}
+            @mockFiles.push(file)
+            @model.set("selectedFile", file)
+            @view.render()
+            expect(@view.$el).toContain("input[type=file]")
+            expect(@view.$el).not.toContain("p.error")
+            expect(@view.$(".action-upload")).not.toBeDisabled()
 
-    it "should render an error with an invalid file type selected", ->
-        file = {name: "fake.png", "type": "image/png"}
-        @mockFiles.push(file)
-        @model.set("selectedFile", file)
-        @view.render()
-        expect(@view.$el).toContain("input[type=file]")
-        expect(@view.$el).toContain("p.error")
-        expect(@view.$(".action-upload")).toBeDisabled()
+        it "should render an error with an invalid file type selected", ->
+            file = {name: "fake.png", "type": "image/png"}
+            @mockFiles.push(file)
+            @model.set("selectedFile", file)
+            @view.render()
+            expect(@view.$el).toContain("input[type=file]")
+            expect(@view.$el).toContain("p.error")
+            expect(@view.$(".action-upload")).toBeDisabled()
 
 
-    it "adds body class on show()", ->
-        @view.show()
-        expect(@view.options.shown).toBeTruthy()
-        # can't test: this blows up the spec runner
-        # expect($("body")).toHaveClass("dialog-is-shown")
+        it "adds body class on show()", ->
+            @view.show()
+            expect(@view.options.shown).toBeTruthy()
+            # can't test: this blows up the spec runner
+            # expect($("body")).toHaveClass("dialog-is-shown")
 
-    it "removes body class on hide()", ->
-        @view.hide()
-        expect(@view.options.shown).toBeFalsy()
-        # can't test: this blows up the spec runner
-        # expect($("body")).not.toHaveClass("dialog-is-shown")
+        it "removes body class on hide()", ->
+            @view.hide()
+            expect(@view.options.shown).toBeFalsy()
+            # can't test: this blows up the spec runner
+            # expect($("body")).not.toHaveClass("dialog-is-shown")
 
-    it "can upload correctly", ->
-        @view.upload()
-        expect(@model.get("uploading")).toBeTruthy()
-        expect(@requests.length).toEqual(1)
-        request = @requests[0]
-        expect(request.url).toEqual(UPLOAD_ASSET_CALLBACK_URL)
-        expect(request.method).toEqual("POST")
+    describe "Uploads", ->
+        beforeEach ->
+            @requests = requests = []
+            @xhr = sinon.useFakeXMLHttpRequest()
+            @xhr.onCreate = (xhr) -> requests.push(xhr)
+            @clock = sinon.useFakeTimers()
 
-        request.respond(200, {"Content-Type": "application/json"},
-                '{"displayname": "starfish", "url": "/uploaded/starfish.pdf"}')
-        expect(@model.get("uploading")).toBeFalsy()
-        expect(@model.get("finished")).toBeTruthy()
-        expect(@chapter.get("name")).toEqual("starfish")
-        expect(@chapter.get("asset_path")).toEqual("/uploaded/starfish.pdf")
+        afterEach ->
+            @xhr.restore()
+            @clock.restore()
 
-    it "can handle upload errors", ->
-        @view.upload()
-        @requests[0].respond(500)
-        expect(@model.get("title")).toMatch(/error/)
-        expect(@view.remove).not.toHaveBeenCalled()
+        it "can upload correctly", ->
+            @view.upload()
+            expect(@model.get("uploading")).toBeTruthy()
+            expect(@requests.length).toEqual(1)
+            request = @requests[0]
+            expect(request.url).toEqual(UPLOAD_ASSET_CALLBACK_URL)
+            expect(request.method).toEqual("POST")
 
-describe "CMS.Views.UploadDialog timing", ->
-    tpl = readFixtures("upload-dialog.underscore")
+            request.respond(200, {"Content-Type": "application/json"},
+                    '{"displayname": "starfish", "url": "/uploaded/starfish.pdf"}')
+            expect(@model.get("uploading")).toBeFalsy()
+            expect(@model.get("finished")).toBeTruthy()
+            expect(@chapter.get("name")).toEqual("starfish")
+            expect(@chapter.get("asset_path")).toEqual("/uploaded/starfish.pdf")
 
-    beforeEach ->
-        setFixtures($("<script>", {id: "upload-dialog-tpl", type: "text/template"}).text(tpl))
-        appendSetFixtures($("<script>", {id: "system-feedback-tpl", type: "text/template"}).text(feedbackTpl))
-        window.UPLOAD_ASSET_CALLBACK_URL = "/upload"
-        @requests = requests = []
-        @xhr = sinon.useFakeXMLHttpRequest()
-        @xhr.onCreate = (xhr) -> requests.push(xhr)
+        it "can handle upload errors", ->
+            @view.upload()
+            @requests[0].respond(500)
+            expect(@model.get("title")).toMatch(/error/)
+            expect(@view.remove).not.toHaveBeenCalled()
 
-        @model = new CMS.Models.FileUpload()
-        @chapter = new CMS.Models.Chapter()
-        @view = new CMS.Views.UploadDialog({model: @model, chapter: @chapter})
-        spyOn(@view, 'remove').andCallThrough()
-
-        # create mock file input, so that we aren't subject to browser restrictions
-        @mockFiles = []
-        mockFileInput = jasmine.createSpy('mockFileInput')
-        mockFileInput.files = @mockFiles
-        jqMockFileInput = jasmine.createSpyObj('jqMockFileInput', ['get', 'replaceWith'])
-        jqMockFileInput.get.andReturn(mockFileInput)
-        realMethod = @view.$
-        spyOn(@view, "$").andCallFake (selector) ->
-            if selector == "input[type=file]"
-                jqMockFileInput
-            else
-                realMethod.apply(this, arguments)
-
-        @clock = sinon.useFakeTimers()
-
-    afterEach ->
-        delete window.UPLOAD_ASSET_CALLBACK_URL
-        @xhr.restore()
-        @clock.restore()
-
-    it "removes itself after two seconds on successful upload", ->
-        @view.upload()
-        @requests[0].respond(200, {"Content-Type": "application/json"},
-                '{"displayname": "starfish", "url": "/uploaded/starfish.pdf"}')
-        expect(@view.remove).not.toHaveBeenCalled()
-        @clock.tick(2001)
-        expect(@view.remove).toHaveBeenCalled()
+        it "removes itself after two seconds on successful upload", ->
+            @view.upload()
+            @requests[0].respond(200, {"Content-Type": "application/json"},
+                    '{"displayname": "starfish", "url": "/uploaded/starfish.pdf"}')
+            expect(@view.remove).not.toHaveBeenCalled()
+            @clock.tick(2001)
+            expect(@view.remove).toHaveBeenCalled()