diff --git a/.travis.yml b/.travis.yml
index 264706a..09fad33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,5 @@ rvm:
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "gem uninstall eventmachine"
 before_script:
   - psql -c 'create database bikebike_test;' -U postgres
diff --git a/Gemfile b/Gemfile
index 12e1701..a07f5ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ gem 'rails', '4.0.0'
 # Servers
 # gem 'puma'
 # gem 'unicorn'
+gem 'eventmachine'
 gem 'thin'
 
 # Multi-environment configuration
@@ -65,7 +66,6 @@ gem 'geocoder'
 gem 'forgery'
 gem 'paper_trail'
 
-#gem 'eventmachine'
 
 group :development, :test do
 	gem 'debugger'