diff --git a/Gemfile b/Gemfile
index 9ef26577..5d552334 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '1.9.3' rescue nil
 source :rubygems
 gemspec
 
-gem 'puma'
+gem 'unicorn'
 gem 'travis-support', github: 'travis-ci/travis-support'
 gem 'travis-core',    github: 'travis-ci/travis-core'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil
diff --git a/Gemfile.lock b/Gemfile.lock
index 20d20678..b327cdd3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,6 +156,7 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
+    kgio (2.7.4)
     listen (0.5.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -188,8 +189,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    puma (1.6.3)
-      rack (~> 1.2)
     pusher (0.9.4)
       multi_json (~> 1.0)
       signature (~> 0.1.2)
@@ -209,6 +208,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    raindrops (0.10.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -264,6 +264,10 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
+    unicorn (4.4.0)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     uuidtools (2.1.3)
     yajl-ruby (1.1.0)
     yard (0.8.3)
@@ -281,7 +285,6 @@ DEPENDENCIES
   micro_migrations!
   mocha (~> 0.12)
   pry
-  puma
   rack-cache (~> 1.2)
   rack-contrib!
   rake (~> 0.9.2)
@@ -292,4 +295,5 @@ DEPENDENCIES
   travis-core!
   travis-sidekiqs!
   travis-support!
+  unicorn
   yard-sinatra!
diff --git a/script/server b/script/server
index a17c4245..29326751 100755
--- a/script/server
+++ b/script/server
@@ -3,6 +3,6 @@ cd "$(dirname "$0")/.."
 [ $PORT ]     || PORT=3000
 [ $RACK_ENV ] || RACK_ENV=development
 
-cmd="ruby -I lib -S bundle exec ruby -I lib -S puma config.ru -p $PORT -e $RACK_ENV --threads 0:16"
-[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -b tcp://127.0.0.1:$PORT"
+cmd="ruby -I lib -S bundle exec ruby -I lib -S unicorn config.ru -p $PORT -E $RACK_ENV"
+[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -l 127.0.0.1:$PORT"
 exec $cmd