diff --git a/spec/fabricators/contact_fabricator.rb b/spec/fabricators/contact_fabricator.rb
index 0ce9fbd53..68289d77c 100644
--- a/spec/fabricators/contact_fabricator.rb
+++ b/spec/fabricators/contact_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:contact) do
-  registrar { Registrar.find_by_code('FIXED') }
+  registrar { Fabricate(:registrar) }
   code { sequence(:code) { |i| "SH#{Faker::Number.number(8)}#{i}" } }
   auth_info 'password'
   name { sequence(:name) { |i| "#{Faker::Name.name}#{i}" } }
diff --git a/spec/fabricators/domain_fabricator.rb b/spec/fabricators/domain_fabricator.rb
index 24f7a45f4..e1ee9b989 100644
--- a/spec/fabricators/domain_fabricator.rb
+++ b/spec/fabricators/domain_fabricator.rb
@@ -7,7 +7,7 @@ Fabricator(:domain) do
   nameservers(count: 3)
   admin_domain_contacts(count: 1) { Fabricate(:admin_domain_contact) }
   tech_domain_contacts(count: 1) { Fabricate(:tech_domain_contact) }
-  registrar { Registrar.find_by_code('FIXED') }
+  registrar { Fabricate(:registrar) }
   auth_info '98oiewslkfkd'
 end
 
diff --git a/spec/fabricators/registrant_fabricator.rb b/spec/fabricators/registrant_fabricator.rb
index f3e07220d..445134fb9 100644
--- a/spec/fabricators/registrant_fabricator.rb
+++ b/spec/fabricators/registrant_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:registrant) do
-  registrar { Registrar.find_by_code('FIXED') }
+  registrar { Fabricate(:registrar) }
   code { sequence(:code) { |i| "REGISTRANT#{Faker::Number.number(8)}#{i}" } }
   auth_info 'password'
   name { sequence(:name) { |i| "REGISTRANT #{Faker::Name.name}#{i}" } }
diff --git a/spec/features/registrar/sessions_spec.rb b/spec/features/registrar/sessions_spec.rb
index eba0d6dfa..f6f10ceb8 100644
--- a/spec/features/registrar/sessions_spec.rb
+++ b/spec/features/registrar/sessions_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Sessions', type: :feature do
+RSpec.feature 'Sessions' do
   context 'with invalid ip' do
     it 'should not see login page' do
       Setting.registrar_ip_whitelist_enabled = true
@@ -18,6 +18,7 @@ feature 'Sessions', type: :feature do
     end
 
     it 'should see log in' do
+      @fixed_registrar = Fabricate(:registrar, name: 'fixed registrar', code: 'FIXED')
       @fixed_registrar.white_ips = [Fabricate(:white_ip_registrar)]
       visit registrar_login_path
       page.should have_text('Log in')
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6201e1ba8..f3d0c1192 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -45,11 +45,6 @@ def create_settings
   Setting.tech_contacts_max_count = 10
 
   Setting.client_side_status_editing_enabled = true
-
-  # speedup and easier to create fabrications
-  @fixed_registrar =
-      Registrar.find_by_name('fixed registrar') ||
-          Fabricate(:registrar, name: 'fixed registrar', code: 'FIXED')
 end
 
 RSpec.configure do |config|