diff --git a/common/lib/xmodule/xmodule/js/spec/helper.coffee b/common/lib/xmodule/xmodule/js/spec/helper.coffee
index bed85cee4d..c92cdbe414 100644
--- a/common/lib/xmodule/xmodule/js/spec/helper.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/helper.coffee
@@ -58,7 +58,7 @@ window.jQuery.ajaxWithPrefix = (url, settings) ->
     oldAjaxWithPrefix.apply @, arguments
 
 # Time waitsFor() should wait for before failing a test.
-window.WAIT_TIMEOUT = 1000
+window.WAIT_TIMEOUT = 5000
 
 jasmine.getFixtures().fixturesPath += 'fixtures'
 
diff --git a/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js b/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
index 85db07ac87..21c2750cac 100644
--- a/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
+++ b/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
@@ -16,7 +16,7 @@
         });
 
         afterEach(function() {
-            YT.Player = void 0;
+            state = undefined;
             $.fn.scrollTo.reset();
             $('.subtitles').remove();
             $('source').remove();
@@ -40,10 +40,7 @@
                         expect(player.video.play).toHaveBeenCalled();
                     });
 
-                    // Temporarily disabled due to intermittent failures
-                    // Fails with "timeout: timed out after 1000 msec waiting for Player state should be changed"
-                    // on Firefox
-                    xit('player state was changed', function () {
+                    it('player state was changed', function () {
                         waitsFor(function () {
                             return player.getPlayerState() !== STATUS.PAUSED;
                         }, 'Player state should be changed', WAIT_TIMEOUT);
@@ -63,36 +60,36 @@
                         });
                     });
                 });
-            });
 
-            describe('when player is played', function () {
-                beforeEach(function () {
-                    spyOn(player.video, 'pause').andCallThrough();
-                    player.playerState  = STATUS.PLAYING;
-                    $(player.videoEl).trigger('click');
-                });
-
-                it('native event was called', function () {
-                    expect(player.video.pause).toHaveBeenCalled();
-                });
-
-                it('player state was changed', function () {
-                    waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.PLAYING;
-                    }, 'Player state should be changed', WAIT_TIMEOUT);
-
-                    runs(function () {
-                        expect(player.getPlayerState()).toBe(STATUS.PAUSED);
+                describe('when player is playing', function () {
+                    beforeEach(function () {
+                        spyOn(player.video, 'pause').andCallThrough();
+                        player.playerState  = STATUS.PLAYING;
+                        $(player.videoEl).trigger('click');
                     });
-                });
 
-                it('callback was called', function () {
-                    waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.PLAYING;
-                    }, 'Player state should be changed', WAIT_TIMEOUT);
+                    it('native event was called', function () {
+                        expect(player.video.pause).toHaveBeenCalled();
+                    });
 
-                    runs(function () {
-                        expect(player.callStateChangeCallback).toHaveBeenCalled();
+                    it('player state was changed', function () {
+                        waitsFor(function () {
+                            return player.getPlayerState() !== STATUS.PLAYING;
+                        }, 'Player state should be changed', WAIT_TIMEOUT);
+
+                        runs(function () {
+                            expect(player.getPlayerState()).toBe(STATUS.PAUSED);
+                        });
+                    });
+
+                    it('callback was called', function () {
+                        waitsFor(function () {
+                            return player.getPlayerState() !== STATUS.PLAYING;
+                        }, 'Player state should be changed', WAIT_TIMEOUT);
+
+                        runs(function () {
+                            expect(player.callStateChangeCallback).toHaveBeenCalled();
+                        });
                     });
                 });
             });
@@ -132,7 +129,11 @@
             describe('pause', function () {
                 beforeEach(function () {
                     spyOn(player.video, 'pause').andCallThrough();
+                    player.playerState = STATUS.UNSTARTED;
                     player.playVideo();
+                    waitsFor(function () {
+                        return player.getPlayerState() !== STATUS.UNSTARTED;
+                    }, 'Video never started playing', WAIT_TIMEOUT);
                     player.pauseVideo();
                 });
 
@@ -142,7 +143,7 @@
 
                 it('player state was changed', function () {
                     waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.UNSTARTED;
+                        return player.getPlayerState() !== STATUS.PLAYING;
                     }, 'Player state should be changed', WAIT_TIMEOUT);
 
                     runs(function () {
@@ -152,7 +153,7 @@
 
                 it('callback was called', function () {
                     waitsFor(function () {
-                        return player.getPlayerState() !== STATUS.UNSTARTED;
+                        return player.getPlayerState() !== STATUS.PLAYING;
                     }, 'Player state should be changed', WAIT_TIMEOUT);
                     runs(function () {
                         expect(player.callStateChangeCallback).toHaveBeenCalled();