diff --git a/Gemfile b/Gemfile
index b8481a0b..c296671d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ gem 's3',              github: 'travis-ci/s3'
 
 gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
+gem 'travis-amqp',     github: 'travis-ci/travis-amqp'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
diff --git a/Gemfile.lock b/Gemfile.lock
index 327385fc..2dd61f90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,6 +40,12 @@ GIT
     s3 (0.3.21)
       proxies (~> 0.2.0)
 
+GIT
+  remote: git://github.com/travis-ci/travis-amqp.git
+  revision: c388299757b7eda2cc0e33cdc7d90113cf283e6a
+  specs:
+    travis-amqp (0.0.1)
+
 GIT
   remote: git://github.com/travis-ci/travis-core.git
   revision: f7b3a76b3f39c28bb5cf7b9dc24acec13908a11a
@@ -372,6 +378,7 @@ DEPENDENCIES
   sinatra-contrib
   skylight (~> 0.6.0.beta.1)
   stackprof
+  travis-amqp!
   travis-api!
   travis-config (~> 0.1.0)
   travis-core!
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index b476333c..7fe1a6b7 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -4,8 +4,8 @@ require 'active_record_postgres_variables'
 
 # now actually load travis
 require 'travis'
+require 'travis/amqp'
 require 'travis/model'
-require 'travis/support/amqp'
 require 'travis/states_cache'
 require 'rack'
 require 'rack/protection'
@@ -181,7 +181,7 @@ module Travis::Api
 
       def self.setup_travis
         Travis::Async.enabled = true
-        Travis::Amqp.config = Travis.config.amqp
+        Travis::Amqp.setup(Travis.config.amqp)
 
         setup_database_connections