diff --git a/config/application.rb b/config/application.rb
index 08ae3ba54..87f80a1a2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,6 +9,9 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
+# use newrelic if configured via config/newrelic.yml
+require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
+
 require File.expand_path('../../lib/fake', __FILE__)
 
 module Diaspora
diff --git a/config/environment.rb b/config/environment.rb
index 959ae98c0..26adfb6b1 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,9 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-# use newrelic if configured via config/newrelic.yml
-require 'newrelic_rpm' if File.exists?(File.expand_path('../newrelic.yml', __FILE__))
-
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5