diff --git a/Gemfile b/Gemfile
index 62bdf66..ed85ff1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'omniauth',         '~> 1.1.1'
 gem 'omniauth-twitter', '~> 0.0.14'
 gem 'omniauth-github',  '~> 1.0.3'
 gem 'kaminari',         '~> 0.14.1'
-gem 'airbrake',         '~> 3.1.7'
+gem 'airbrake',         '~> 3.1.7', :require => false
 gem 'draper',           '~> 1.1.0'
 gem 'fog',              '~> 1.9.0'
 gem 'simple_form',      '~> 2.0.4'
diff --git a/config/initializers/errbit.rb b/config/initializers/errbit.rb
index ee5bca7..697867b 100644
--- a/config/initializers/errbit.rb
+++ b/config/initializers/errbit.rb
@@ -1,12 +1,13 @@
-Airbrake.configure do |config|
-  unless CFG['AIRBRAKE_API_KEY'].blank?
+if CFG['AIRBRAKE_API_KEY']
+  require 'airbrake'
+
+  Airbrake.configure do |config|
     config.api_key     = CFG['AIRBRAKE_API_KEY']
     config.host        = CFG['AIRBRAKE_HOST']
     config.port        = 80
     config.secure      = config.port == 443
-  end
 
-  envs = ['development', 'bugfix']
-  envs << Rails.env if CFG['AIRBRAKE_API_KEY'].blank?
-  config.development_environments = envs
+    envs = ['development', 'bugfix']
+    config.development_environments = envs
+  end
 end