diff --git a/lib/tasks/plugins_tests.rake b/lib/tasks/plugins_tests.rake
index 27cf0ec..f5201c5 100644
--- a/lib/tasks/plugins_tests.rake
+++ b/lib/tasks/plugins_tests.rake
@@ -4,7 +4,6 @@ $broken_plugins = %w[
   comment_classification
   ldap
   solr
-  stoa
 ]
 
 @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template']
diff --git a/plugins/stoa/lib/stoa_plugin.rb b/plugins/stoa/lib/stoa_plugin.rb
index ab6039f..67dcf06 100644
--- a/plugins/stoa/lib/stoa_plugin.rb
+++ b/plugins/stoa/lib/stoa_plugin.rb
@@ -60,13 +60,14 @@ class StoaPlugin < Noosfero::Plugin
   end
 
   def account_controller_filters
-    block = lambda do |context|
+    block = proc do
       params[:profile_data] ||= {}
       params[:profile_data][:invitation_code] = params[:invitation_code]
       invitation = Task.pending.find(:first, :conditions => {:code => params[:invitation_code]})
       if request.post?
         if !invitation && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
-          @person = Person.new(:environment => context.environment)
+          # `self` below is evaluated in the context of account_controller
+          @person = Person.new(:environment => self.environment)
           @person.errors.add(:usp_id, _(' validation failed'))
           render :action => :signup
         end
diff --git a/plugins/stoa/test/functional/invite_controller_test.rb b/plugins/stoa/test/functional/invite_controller_test.rb
index bd38ab1..da1a3a4 100644
--- a/plugins/stoa/test/functional/invite_controller_test.rb
+++ b/plugins/stoa/test/functional/invite_controller_test.rb
@@ -57,7 +57,7 @@ class InviteControllerTest < ActionController::TestCase
     organization.add_admin(admin)
 
     login_as(admin.identifier)
-    get :search_friend, :profile => organization.identifier, :q => '1234'
+    get :search, :profile => organization.identifier, :q => '1234'
 
     assert_equal [{"id" => person.id, "name" => person.name}].to_json, @response.body
     assert_response 200
--
libgit2 0.21.2