diff --git a/.travis.yml b/.travis.yml
index 09fad33..c8756f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,6 @@ rvm:
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - "gem install eventmachine"
 before_script:
   - psql -c 'create database bikebike_test;' -U postgres
diff --git a/Gemfile b/Gemfile
index a221bdd..12e1701 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ gem 'geocoder'
 gem 'forgery'
 gem 'paper_trail'
 
-gem 'eventmachine'
+#gem 'eventmachine'
 
 group :development, :test do
 	gem 'debugger'
diff --git a/Gemfile.lock b/Gemfile.lock
index cc6ada8..86ef600 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,7 +319,6 @@ DEPENDENCIES
   debugger
   delorean
   email_spec
-  eventmachine
   factory_girl_rails
   forgery
   foundation-rails