diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index a057e91b..09bd5d02 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -120,11 +120,9 @@ module Travis::Api
         Travis::Amqp.config = Travis.config.amqp
         Travis::Database.connect
 
-        if Travis.env == 'production'
-          ::Octopus.setup do |config|
-            config.shards = { :follower => Travis.config.database_follower }
-            config.environments = [:production]
-          end
+        # only used in Production by default
+        ::Octopus.setup do |config|
+          config.shards = { :follower => Travis.config.database_follower }
         end
 
         Travis::Features.start