diff --git a/spec/fabricators/registrar_fabricator.rb b/spec/fabricators/registrar_fabricator.rb
index f3a3fdc59..37236cb87 100644
--- a/spec/fabricators/registrar_fabricator.rb
+++ b/spec/fabricators/registrar_fabricator.rb
@@ -9,7 +9,6 @@ Fabricator(:registrar) do
   country_code 'EE'
   code { sequence(:code) { |i| "REGISTRAR#{i}" } }
   reference_no { sequence(:reference_no) { |i| "RF#{i}" } }
-  white_ips { [Fabricate(:white_ip), Fabricate(:white_ip, interfaces: [WhiteIp::REGISTRAR])] }
 end
 
 Fabricator(:registrar_with_no_account_activities, from: :registrar) do
diff --git a/spec/fabricators/white_ip_fabricator.rb b/spec/fabricators/white_ip_fabricator.rb
deleted file mode 100644
index 6eb574893..000000000
--- a/spec/fabricators/white_ip_fabricator.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-Fabricator(:white_ip) do
-  ipv4 '127.0.0.1'
-  interfaces [WhiteIp::API]
-end
-
-Fabricator(:white_ip_registrar, from: :white_ip) do
-  interfaces [WhiteIp::REGISTRAR]
-end
diff --git a/spec/factories/white_ip.rb b/spec/factories/white_ip.rb
new file mode 100644
index 000000000..eb4033fc9
--- /dev/null
+++ b/spec/factories/white_ip.rb
@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :white_ip do
+    ipv4 '127.0.0.1'
+  end
+end
diff --git a/spec/models/white_ip_spec.rb b/spec/models/white_ip_spec.rb
index 316a6b263..931431c1e 100644
--- a/spec/models/white_ip_spec.rb
+++ b/spec/models/white_ip_spec.rb
@@ -25,7 +25,7 @@ describe WhiteIp do
 
   context 'with valid attributes' do
     before :all do
-      @white_ip = Fabricate(:white_ip)
+      @white_ip = create(:white_ip)
     end
 
     it 'should have one version' do