diff --git a/test/controllers/diary_comments_controller_test.rb b/test/controllers/diary_comments_controller_test.rb
index 5344d052d63..78ab95b1b61 100644
--- a/test/controllers/diary_comments_controller_test.rb
+++ b/test/controllers/diary_comments_controller_test.rb
@@ -3,12 +3,6 @@
 require "test_helper"
 
 class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
-  def setup
-    super
-    # Create the default language for diary entries
-    create(:language, :code => "en")
-  end
-
   def test_routes
     assert_routing(
       { :path => "/user/username/diary/1/comments", :method => :post },
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index a0c7428d6c1..1c7a297b14d 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -372,7 +372,6 @@ def test_auth_failure_callback
 
   def test_show_profile_diaries
     user = create(:user)
-    create(:language, :code => "en")
     create(:diary_entry, :user => user, :title => "First Entry", :body => "First body")
     create(:diary_entry, :user => user, :title => "Second Entry", :body => "Second body")
     create(:diary_entry, :user => user, :title => "Third Entry", :body => "Third body")
@@ -393,7 +392,6 @@ def test_show_profile_diaries
 
   def test_show_profile_diaries_with_comments
     user = create(:user)
-    create(:language, :code => "en")
     entry = create(:diary_entry, :user => user, :title => "Entry with Comments")
     create(:diary_comment, :diary_entry => entry)
     create(:diary_comment, :diary_entry => entry)
diff --git a/test/factories/diary_entries.rb b/test/factories/diary_entries.rb
index 076838d8231..f122b10cb8d 100644
--- a/test/factories/diary_entries.rb
+++ b/test/factories/diary_entries.rb
@@ -5,6 +5,7 @@
     sequence(:title) { |n| "Diary entry #{n}" }
     sequence(:body) { |n| "This is diary entry #{n}" }
 
+    language { Language.find_by(:code => "en") || create(:language, :code => "en") }
     user
   end
 end
diff --git a/test/helpers/issues_helper_test.rb b/test/helpers/issues_helper_test.rb
index f41808e3e8e..ff173f182eb 100644
--- a/test/helpers/issues_helper_test.rb
+++ b/test/helpers/issues_helper_test.rb
@@ -6,7 +6,6 @@ class IssuesHelperTest < ActionView::TestCase
   attr_accessor :current_user
 
   def test_reportable_heading_diary_comment
-    create(:language, :code => "en")
     diary_entry = create(:diary_entry, :title => "A Discussion")
     diary_comment = create(:diary_comment, :diary_entry => diary_entry, :created_at => "2020-03-15", :updated_at => "2021-05-17")
 
@@ -20,7 +19,6 @@ def test_reportable_heading_diary_comment
   end
 
   def test_reportable_heading_diary_entry
-    create(:language, :code => "en")
     diary_entry = create(:diary_entry, :title => "Important Subject", :created_at => "2020-03-24", :updated_at => "2021-05-26")
 
     heading = reportable_heading diary_entry
diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb
index 57aa2279549..2d1f57bad6b 100644
--- a/test/mailers/user_mailer_test.rb
+++ b/test/mailers/user_mailer_test.rb
@@ -99,7 +99,6 @@ def test_message_notification
   end
 
   def test_diary_comment_notification
-    create(:language, :code => "en")
     user = create(:user)
     other_user = create(:user)
     diary_entry = create(:diary_entry, :user => user)
@@ -142,7 +141,6 @@ def test_note_comment_notification
   end
 
   def test_changeset_comment_notification
-    create(:language, :code => "en")
     user = create(:user)
     other_user = create(:user)
     changeset = create(:changeset, :user => user)
diff --git a/test/models/diary_comment_test.rb b/test/models/diary_comment_test.rb
index e00274e975e..403962c38d0 100644
--- a/test/models/diary_comment_test.rb
+++ b/test/models/diary_comment_test.rb
@@ -3,11 +3,6 @@
 require "test_helper"
 
 class DiaryCommentTest < ActiveSupport::TestCase
-  def setup
-    # Create the default language for diary entries
-    create(:language, :code => "en")
-  end
-
   test "body must be present" do
     comment = build(:diary_comment, :body => "")
     assert_not comment.valid?
diff --git a/test/models/diary_entry_test.rb b/test/models/diary_entry_test.rb
index e130589eee0..6c353b51980 100644
--- a/test/models/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -3,11 +3,6 @@
 require "test_helper"
 
 class DiaryEntryTest < ActiveSupport::TestCase
-  def setup
-    # Create the default language for diary entries
-    create(:language, :code => "en")
-  end
-
   def test_diary_entry_validations
     diary_entry_valid({})
     diary_entry_valid({ :title => "" }, :valid => false)
diff --git a/test/models/issue_test.rb b/test/models/issue_test.rb
index 55b4bb7faf5..a8f5ba6db79 100644
--- a/test/models/issue_test.rb
+++ b/test/models/issue_test.rb
@@ -12,7 +12,6 @@ def test_assigned_role
   end
 
   def test_reported_user
-    create(:language, :code => "en")
     user = create(:user)
     note = create(:note, :author => create(:user))
     anonymous_note = create(:note, :author => nil)
diff --git a/test/system/report_diary_comment_test.rb b/test/system/report_diary_comment_test.rb
index b904ee07075..217bba64a19 100644
--- a/test/system/report_diary_comment_test.rb
+++ b/test/system/report_diary_comment_test.rb
@@ -4,7 +4,6 @@
 
 class ReportDiaryCommentTest < ApplicationSystemTestCase
   def setup
-    create(:language, :code => "en")
     @diary_entry = create(:diary_entry)
     @comment = create(:diary_comment, :diary_entry => @diary_entry)
   end
diff --git a/test/system/report_diary_entry_test.rb b/test/system/report_diary_entry_test.rb
index 8fde971aaa4..7d774ed5416 100644
--- a/test/system/report_diary_entry_test.rb
+++ b/test/system/report_diary_entry_test.rb
@@ -4,7 +4,6 @@
 
 class ReportDiaryEntryTest < ApplicationSystemTestCase
   def setup
-    create(:language, :code => "en")
     @diary_entry = create(:diary_entry)
   end
 
diff --git a/test/system/user_logout_test.rb b/test/system/user_logout_test.rb
index 48c19e42ffa..3fa2723a746 100644
--- a/test/system/user_logout_test.rb
+++ b/test/system/user_logout_test.rb
@@ -49,7 +49,6 @@ class UserLogoutTest < ApplicationSystemTestCase
   end
 
   test "Sign out after navigating diary entries with Turbo pagination" do
-    create(:language, :code => "en")
     create(:diary_entry, :title => "First Diary Entry")
     create_list(:diary_entry, 20) # rubocop:disable FactoryBot/ExcessiveCreateList