diff --git a/.rubocop.yml b/.rubocop.yml
index 4807f0453..61208ad4b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,3 +24,6 @@ Metrics/LineLength:
 
 Layout/IndentationConsistency:
   EnforcedStyle: rails
+
+RSpec/BeforeAfterAll:
+  Enabled: true
diff --git a/spec/lib/manager_authenticator_spec.rb b/spec/lib/manager_authenticator_spec.rb
index 8f27a61d3..34f1f9819 100644
--- a/spec/lib/manager_authenticator_spec.rb
+++ b/spec/lib/manager_authenticator_spec.rb
@@ -1,66 +1,60 @@
 require 'rails_helper'
 
 describe ManagerAuthenticator do
+  let(:authenticator) { ManagerAuthenticator.new(login: "JJB033", clave_usuario: "31415926", fecha_conexion: "20151031135905") }
+
   describe 'initialization params' do
     it 'should cause auth to return false if blank login' do
-      authenticator = ManagerAuthenticator.new(login: "", clave_usuario: "31415926", fecha_conexion: "20151031135905")
-      expect(authenticator.auth).to be false
+      blank_login_authenticator = ManagerAuthenticator.new(login: "", clave_usuario: "31415926", fecha_conexion: "20151031135905")
+      expect(blank_login_authenticator.auth).to be false
     end
 
     it 'should cause auth to return false if blank user_key' do
-      authenticator = ManagerAuthenticator.new(login: "JJB033", clave_usuario: "", fecha_conexion: "20151031135905")
-      expect(authenticator.auth).to be false
+      blank_user_key_authenticator = ManagerAuthenticator.new(login: "JJB033", clave_usuario: "", fecha_conexion: "20151031135905")
+      expect(blank_user_key_authenticator.auth).to be false
     end
 
     it 'should cause auth to return false if blank date' do
-      authenticator = ManagerAuthenticator.new(login: "JJB033", clave_usuario: "31415926", fecha_conexion: "")
-      expect(authenticator.auth).to be false
+      blank_date_authenticator = ManagerAuthenticator.new(login: "JJB033", clave_usuario: "31415926", fecha_conexion: "")
+      expect(blank_date_authenticator.auth).to be false
     end
   end
 
   describe '#auth' do
-    before(:all) do
-      @authenticator = ManagerAuthenticator.new(login: "JJB033", clave_usuario: "31415926", fecha_conexion: "20151031135905")
-    end
-
     it 'should return false if not manager_exists' do
-      allow(@authenticator).to receive(:manager_exists?).and_return(false)
-      allow(@authenticator).to receive(:application_authorized?).and_return(true)
+      allow(authenticator).to receive(:manager_exists?).and_return(false)
+      allow(authenticator).to receive(:application_authorized?).and_return(true)
 
-      expect(@authenticator.auth).to be false
+      expect(authenticator.auth).to be false
     end
 
     it 'should return false if not application_authorized' do
-      allow(@authenticator).to receive(:manager_exists?).and_return(true)
-      allow(@authenticator).to receive(:application_authorized?).and_return(false)
+      allow(authenticator).to receive(:manager_exists?).and_return(true)
+      allow(authenticator).to receive(:application_authorized?).and_return(false)
 
-      expect(@authenticator.auth).to be false
+      expect(authenticator.auth).to be false
     end
 
     it 'should return ok if manager_exists and application_authorized' do
-      allow(@authenticator).to receive(:manager_exists?).and_return(true)
-      allow(@authenticator).to receive(:application_authorized?).and_return(true)
+      allow(authenticator).to receive(:manager_exists?).and_return(true)
+      allow(authenticator).to receive(:application_authorized?).and_return(true)
 
-      expect(@authenticator.auth).to be_truthy
+      expect(authenticator.auth).to be_truthy
     end
   end
 
   describe 'SOAP' do
-    before(:all) do
-      @authenticator = ManagerAuthenticator.new(login: "JJB033", clave_usuario: "31415926", fecha_conexion: "20151031135905")
-    end
-
     it 'should call the verification user method' do
       message = { ub: {user_key: "31415926", date: "20151031135905"} }
-      allow(@authenticator).to receive(:application_authorized?).and_return(true)
-      expect(@authenticator.send(:client)).to receive(:call).with(:get_status_user_data, message: message)
-      @authenticator.auth
+      allow(authenticator).to receive(:application_authorized?).and_return(true)
+      expect(authenticator.send(:client)).to receive(:call).with(:get_status_user_data, message: message)
+      authenticator.auth
     end
 
     it 'should call the permissions check method' do
-      allow(@authenticator).to receive(:manager_exists?).and_return(true)
-      expect(@authenticator.send(:client)).to receive(:call).with(:get_applications_user_list, message: { ub: {user_key: "31415926"} })
-      @authenticator.auth
+      allow(authenticator).to receive(:manager_exists?).and_return(true)
+      expect(authenticator.send(:client)).to receive(:call).with(:get_applications_user_list, message: { ub: {user_key: "31415926"} })
+      authenticator.auth
     end
   end
 end
diff --git a/spec/lib/tasks/settings_spec.rb b/spec/lib/tasks/settings_spec.rb
index 1311763bf..8a48dce15 100644
--- a/spec/lib/tasks/settings_spec.rb
+++ b/spec/lib/tasks/settings_spec.rb
@@ -15,10 +15,6 @@ describe 'Settings Rake' do
       Rake.application.invoke_task 'settings:per_page_code_migration'
     end
 
-    after(:all) do
-      Setting['per_page_code_head'] = ''
-    end
-
     context 'Neither per_page_code_head or per_page_code Settings exist' do
       before do
         Setting.where(key: 'per_page_code').first&.destroy
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
index 402c0d092..1aeca4088 100644
--- a/spec/models/organization_spec.rb
+++ b/spec/models/organization_spec.rb
@@ -45,7 +45,7 @@ describe Organization do
   end
 
   describe "self.search" do
-    before(:all) {@organization = create(:organization, name: "Watershed", user: create(:user, phone_number: "333"))}
+    let!(:organization) { create(:organization, name: "Watershed", user: create(:user, phone_number: "333")) }
 
     it "returns no results if search term is empty" do
       expect(Organization.search(" ").size).to eq(0)
@@ -55,19 +55,19 @@ describe Organization do
       expect(Organization.search("Greenpeace").size).to eq 0
       search = Organization.search("Tershe")
       expect(search.size).to eq 1
-      expect(search.first).to eq @organization
+      expect(search.first).to eq organization
     end
 
     scenario "finds by users email" do
-      search = Organization.search(@organization.user.email)
+      search = Organization.search(organization.user.email)
       expect(search.size).to eq 1
-      expect(search.first).to eq @organization
+      expect(search.first).to eq organization
     end
 
     scenario "finds by users phone number" do
-      search = Organization.search(@organization.user.phone_number)
+      search = Organization.search(organization.user.phone_number)
       expect(search.size).to eq 1
-      expect(search.first).to eq @organization
+      expect(search.first).to eq organization
     end
   end
 end