diff --git a/faye-websocket.gemspec b/faye-websocket.gemspec
index 0bcfb32..2bf3a02 100644
--- a/faye-websocket.gemspec
+++ b/faye-websocket.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "progressbar"
   s.add_development_dependency "rack"
   s.add_development_dependency "rake-compiler"
-  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_development_dependency "rspec"
 
   unless RUBY_PLATFORM =~ /java/
     s.add_development_dependency "rainbows", ">= 1.0.0"
diff --git a/spec/faye/websocket/client_spec.rb b/spec/faye/websocket/client_spec.rb
index 2a7cee4..c33b197 100644
--- a/spec/faye/websocket/client_spec.rb
+++ b/spec/faye/websocket/client_spec.rb
@@ -84,11 +84,6 @@ describe Faye::WebSocket::Client do
   let(:plain_text_url) { "ws://0.0.0.0:8000/"  }
   let(:secure_url)     { "wss://0.0.0.0:8000/" }
   
-  before do
-    Thread.new { EM.run }
-    sleep(0.1) until EM.reactor_running?
-  end
-  
   shared_examples_for "socket client" do
     it "can open a connection" do
       open_socket(socket_url, protocols)
@@ -147,19 +142,7 @@ describe Faye::WebSocket::Client do
     let(:blocked_url) { secure_url }
     
     before { server 8000, :thin, false }
-    after  { sync ; stop }
-    
-    it_should_behave_like "socket client"
-  end
-  
-  describe "with a plain-text Rainbows server" do
-    next if Faye::WebSocket.rbx?
-    
-    let(:socket_url)  { plain_text_url }
-    let(:blocked_url) { secure_url }
-    
-    before { server 8000, :rainbows, false }
-    after  { sync ; stop }
+    after  { stop }
     
     it_should_behave_like "socket client"
   end
@@ -171,7 +154,7 @@ describe Faye::WebSocket::Client do
     let(:blocked_url) { plain_text_url }
     
     before { server 8000, :thin, true }
-    after  { sync ; stop }
+    after  { stop }
     
     it_should_behave_like "socket client"
   end
diff --git a/vendor/em-rspec b/vendor/em-rspec
index b21022e..04b3a3a 160000
--- a/vendor/em-rspec
+++ b/vendor/em-rspec
@@ -1 +1 @@
-Subproject commit b21022ea503bdd00795edfae33161369659f39ab
+Subproject commit 04b3a3a107c5be8511903e036ca1a73360b58de3