diff --git a/common/static/coffee/spec/logger_spec.coffee b/common/static/coffee/spec/logger_spec.coffee
index 3a274f101e..9c9e3110a0 100644
--- a/common/static/coffee/spec/logger_spec.coffee
+++ b/common/static/coffee/spec/logger_spec.coffee
@@ -1,10 +1,22 @@
 describe 'Logger', ->
+  beforeEach ->
+    window.analytics = jasmine.createSpyObj('analytics', ['track'])
+    analytics.track.andCallFake(->
+      $.ajax('/foo');
+    )
+    @requests = requests = []
+    @xhr = sinon.useFakeXMLHttpRequest()
+    @xhr.onCreate = (xhr) -> requests.push(xhr)
+  
+  afterEach ->
+    @xhr.restore()
+    delete window.analytics
+
   it 'expose window.log_event', ->
     expect(window.log_event).toBe Logger.log
 
   describe 'log', ->
-    it 'send event to Segment.io if event is whitelisted', ->
-      spyOn 'analytics.track'
+    it 'sends an event to Segment.io, if the event is whitelisted', ->
       Logger.log 'seq_goto', 'data'
       expect(analytics.track).toHaveBeenCalledWith 'seq_goto', 'data'
 
@@ -16,6 +28,17 @@ describe 'Logger', ->
         event: '"data"'
         page: window.location.href
 
+    it 'continues to log events if Segment.io is down', ->
+      spyOn($, 'getWithPrefix').andCallThrough()
+      Logger.log 'seq_goto', 'data'
+      expect(@requests.length).toEqual 2
+      expect(@requests[0].url).toMatch /foo/
+      @requests[0].respond(500)
+      expect($.getWithPrefix).toHaveBeenCalledWith '/event',
+        event_type: 'seq_goto'
+        event: '"data"'
+        page: window.location.href
+
   # Broken with commit 9f75e64? Skipping for now.
   xdescribe 'bind', ->
     beforeEach ->
diff --git a/common/templates/jasmine/jasmine_test_runner.html.erb b/common/templates/jasmine/jasmine_test_runner.html.erb
index 4d82826186..9ea6ef42a3 100644
--- a/common/templates/jasmine/jasmine_test_runner.html.erb
+++ b/common/templates/jasmine/jasmine_test_runner.html.erb
@@ -26,6 +26,7 @@
   <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/tiny_mce.js"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=default"></script>
   <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.timeago.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/sinon-1.7.1.js"></script>
   <script type="text/javascript">
     AjaxPrefix.addAjaxPrefix(jQuery, function() {
        return "";