diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index dd89b45..e2a3c19 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -102,7 +102,7 @@ class ApplicationController < ActionController::Base
   end
 
   def init_noosfero_plugins
-    @plugins = Noosfero::Plugin::Manager.new(self)
+    @plugins = Noosfero::Plugin::Manager.new(environment, self)
     @plugins.each do |plugin|
       prepend_view_path(plugin.class.view_path)
     end
diff --git a/lib/noosfero/plugin/manager.rb b/lib/noosfero/plugin/manager.rb
index f49369c..cdc1fcb 100644
--- a/lib/noosfero/plugin/manager.rb
+++ b/lib/noosfero/plugin/manager.rb
@@ -1,8 +1,10 @@
 class Noosfero::Plugin::Manager
 
+  attr_reader :environment
   attr_reader :context
 
-  def initialize(controller)
+  def initialize(environment, controller)
+    @environment = environment
     @context = Noosfero::Plugin::Context.new(controller)
   end
 
@@ -22,7 +24,7 @@ class Noosfero::Plugin::Manager
   end
 
   def enabled_plugins
-    @enabled_plugins ||= (Noosfero::Plugin.all & context.environment.enabled_plugins).map do |plugin|
+    @enabled_plugins ||= (Noosfero::Plugin.all & environment.enabled_plugins).map do |plugin|
       p = plugin.constantize.new
       p.context = context
       p
diff --git a/test/unit/plugin_manager_test.rb b/test/unit/plugin_manager_test.rb
index a984dba..70f5be9 100644
--- a/test/unit/plugin_manager_test.rb
+++ b/test/unit/plugin_manager_test.rb
@@ -8,9 +8,8 @@ class PluginManagerTest < ActiveSupport::TestCase
     @controller.stubs(:profile).returns()
     @controller.stubs(:request).returns()
     @controller.stubs(:response).returns()
-    @controller.stubs(:environment).returns(@environment)
     @controller.stubs(:params).returns()
-    @manager = Noosfero::Plugin::Manager.new(@controller)
+    @manager = Noosfero::Plugin::Manager.new(@environment, @controller)
   end
   attr_reader :environment
   attr_reader :manager
--
libgit2 0.21.2