diff --git a/Gemfile b/Gemfile
index d3e3552f2..16af92531 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,6 @@ group :test do
   gem "factory_girl_rails"
   gem 'capybara', '>= 2.0.1'
   gem "poltergeist"
-  gem 'faye-websocket', '0.4.7' # until someone fixes https://github.com/jonleighton/poltergeist/issues/320
   gem "launchy"
   gem "database_cleaner"
   gem 'shoulda-matchers'
diff --git a/Gemfile.lock b/Gemfile.lock
index f634801cb..21bb3f275 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -140,9 +140,9 @@ GEM
       omniauth (~> 1.0)
     orm_adapter (0.4.0)
     pg (0.14.1)
-    poltergeist (1.2.0)
+    poltergeist (1.3.0)
       capybara (~> 2.1.0)
-      faye-websocket (~> 0.4, >= 0.4.4)
+      faye-websocket (>= 0.4.4, < 0.5.0)
       http_parser.rb (~> 0.5.3)
     polyglot (0.3.3)
     pry (0.9.12)
@@ -254,7 +254,6 @@ DEPENDENCIES
   devise (~> 2.2.3)
   factory_girl_rails
   faker
-  faye-websocket (= 0.4.7)
   gmaps4rails
   gravatar_image_tag
   guard-rspec