diff --git a/spec/javascripts/stream-spec.js b/spec/javascripts/stream-spec.js
index a23aa2a9e..2345062b6 100644
--- a/spec/javascripts/stream-spec.js
+++ b/spec/javascripts/stream-spec.js
@@ -17,7 +17,9 @@ describe("Stream", function() {
   describe("toggleComments", function() {
 
     beforeEach(function() {
+      jasmine.Clock.useMock();
       $('#jasmine_content').html(
+        '<div class="stream">' +
         '<li class="message" data-guid="4ceef7ba2367bc2e4d0001e9">' +
           '<div class="content">' +
             '<div class="info">' +
@@ -38,21 +40,23 @@ describe("Stream", function() {
               '</li>' +
             '</ul>' +
           '</div>' +
-        '</li>'
+        '</li>' +
+        '</div>'
       );
+      Stream.initialize();
     });
+
     it("toggles class hidden on the comment block", function () {
       expect($('ul.comments')).toHaveClass("hidden");
       $("a.show_post_comments").click();
-      setTimeout(function() {
-        expect($('ul.comments')).not.toHaveClass("hidden");
-      }, 250);
+      jasmine.Clock.tick(200);
+      expect($('ul.comments')).not.toHaveClass("hidden");
     });
+
     it("changes the text on the show comments link", function() {
       $("a.show_post_comments").click();
-      setTimeout(function() {
-        expect($("a.show_post_comments").text()).toEqual("hide comments (0)");
-      }, 250);
+      jasmine.Clock.tick(200);
+      expect($("a.show_post_comments").text()).toEqual("hide comments (0)");
     })
   });
 });
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 5620aea1a..f023e116b 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -15,6 +15,7 @@ src_files:
   - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
   - public/javascripts/vendor/jquery.tipsy.js
   - public/javascripts/vendor/jquery.infieldlabel.js
+  - public/javascripts/vendor/jquery.autoresize.min.js
   - public/javascripts/vendor/fancybox/jquery.fancybox-1.3.1.pack.js
   - public/javascripts/diaspora.js
   - public/javascripts/mobile.js
diff --git a/spec/javascripts/view-spec.js b/spec/javascripts/view-spec.js
index 6a8dc239b..157e374af 100644
--- a/spec/javascripts/view-spec.js
+++ b/spec/javascripts/view-spec.js
@@ -23,6 +23,7 @@ describe("View", function() {
   describe("debug", function() {
     describe("click", function() {
       beforeEach(function() {
+        jasmine.Clock.useMock();
         $("#jasmine_content").html(
           '<div id="debug_info">' +
             '<h5>DEBUG INFO</h5>' +
@@ -37,10 +38,9 @@ describe("View", function() {
         spyOn(View.debug, "click");
         View.initialize();
         $(View.debug.selector).click();
+        jasmine.Clock.tick(200);
         expect(View.debug.click).toHaveBeenCalled();
-        setTimeout(function() { 
-          expect($(View.debug.selector).css("display")).toEqual("block");
-        }, 500);
+        expect($(View.debug.selector).css("display")).toEqual("block");
       });
     });
   });
@@ -115,7 +115,7 @@ describe("View", function() {
         View.initialize();
         $(View.publisher.selector).focus();
         var event = $.Event("keydown");
-        var event.ShiftKey = true;
+        event.ShiftKey = true;
         event.keyCode = 13;
         $(View.publisher.selector).trigger(event);
         expect($.fn.submit).toHaveBeenCalled();