diff --git a/ee/spec/services/gitlab_subscriptions/activate_service_spec.rb b/ee/spec/services/gitlab_subscriptions/activate_service_spec.rb
index 25d3a77bb8659197030ced230f1928a401e0e4f2..89510a034db89e656d13e0a8ed4811e17ad1d566 100644
--- a/ee/spec/services/gitlab_subscriptions/activate_service_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/activate_service_spec.rb
@@ -12,7 +12,7 @@
   let(:activation_code) { 'activation_code' }
   let(:automated) { false }
 
-  let_it_be(:organization) { create(:organization, :default) }
+  let_it_be(:organization) { create(:organization) }
 
   def stub_client_activate
     expect(Gitlab::SubscriptionPortal::Client).to receive(:activate)
diff --git a/ee/spec/services/gitlab_subscriptions/add_on_purchases/create_service_spec.rb b/ee/spec/services/gitlab_subscriptions/add_on_purchases/create_service_spec.rb
index 182dc80b09341fc891e7298feef0cbea25b86304..b707c8b987c4adf3e0cc308ecdcc29d27daebcfd 100644
--- a/ee/spec/services/gitlab_subscriptions/add_on_purchases/create_service_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/add_on_purchases/create_service_spec.rb
@@ -78,7 +78,7 @@
     end
 
     context 'when on .com', :saas do
-      let_it_be(:namespace) { create(:group, :with_organization) }
+      let_it_be(:namespace) { create(:group) }
 
       before do
         stub_ee_application_setting(should_check_namespace_plan: true)
@@ -132,7 +132,7 @@
     end
 
     context 'when not on .com' do
-      let_it_be(:default_organization) { create(:organization, :default) }
+      let_it_be(:organization) { create(:organization) }
 
       let(:namespace) { nil }
 
@@ -164,8 +164,10 @@
 
       include_examples 'no record exists'
 
-      it 'creates record with default organization id' do
-        expect { result }.to change { GitlabSubscriptions::AddOnPurchase.where(organization_id: 1).count }.by(1)
+      it 'creates record with first organization id' do
+        expect { result }.to change {
+          GitlabSubscriptions::AddOnPurchase.where(organization_id: organization.id).count
+        }.by(1)
       end
     end
   end
diff --git a/ee/spec/services/gitlab_subscriptions/add_on_purchases/self_managed/provision_services/base_spec.rb b/ee/spec/services/gitlab_subscriptions/add_on_purchases/self_managed/provision_services/base_spec.rb
index b5eac065ad4233860766fa6ea0b9f2d50c631c92..0a3d6f9d424a7f9a7a60dce4af0dfba133416e5e 100644
--- a/ee/spec/services/gitlab_subscriptions/add_on_purchases/self_managed/provision_services/base_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/add_on_purchases/self_managed/provision_services/base_spec.rb
@@ -218,7 +218,7 @@
 
       let_it_be(:add_on) { create(:gitlab_subscription_add_on, :code_suggestions) }
       let_it_be(:add_on_purchase) { nil }
-      let_it_be(:default_organization) { create(:organization, :default) }
+      let_it_be(:organization) { create(:organization) }
       let_it_be(:namespace) { nil }
       let_it_be(:quantity) { 1 }
       let_it_be(:starts_at) { Date.current }
diff --git a/ee/spec/workers/sync_seat_link_request_worker_spec.rb b/ee/spec/workers/sync_seat_link_request_worker_spec.rb
index b229c588b54f1d83becb6e31097b0a6fad5a8b3d..eb80c3d3bbec8c196c807723e9652f1cd48fd1f8 100644
--- a/ee/spec/workers/sync_seat_link_request_worker_spec.rb
+++ b/ee/spec/workers/sync_seat_link_request_worker_spec.rb
@@ -12,7 +12,7 @@
     let(:seat_link_url) { [subscription_portal_url, '/api/v1/seat_links'].join }
     let(:body) { { success: true } }
 
-    let_it_be(:default_organization) { create(:organization, :default) }
+    let_it_be(:organization) { create(:organization) }
 
     before do
       stub_request(:post, seat_link_url).to_return_json(
@@ -159,7 +159,7 @@
 
         expect(upcoming_reconciliation.next_reconciliation_date).to eq(today)
         expect(upcoming_reconciliation.display_alert_from).to eq(today - 7.days)
-        expect(upcoming_reconciliation.organization_id).to eq(1)
+        expect(upcoming_reconciliation.organization_id).to eq(organization.id)
       end
 
       context 'when an upcoming_reconciliation already exists' do