diff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rb
index 3596176e7faa..da04c4b62491 100644
--- a/config/initializers/permissions.rb
+++ b/config/initializers/permissions.rb
@@ -537,32 +537,6 @@
                       permissible_on: :project
     end
 
-    map.project_module :wiki do |wiki|
-      wiki.permission :view_wiki_pages,
-                      { wiki: %i[index show special menu export] },
-                      permissible_on: :project
-
-      wiki.permission :view_wiki_edits,
-                      { wiki: %i[history diff annotate] },
-                      dependencies: :view_wiki_pages,
-                      permissible_on: :project
-
-      wiki.permission :edit_wiki_pages,
-                      { wiki: %i[edit update preview add_attachment new new_child create rename] },
-                      dependencies: :view_wiki_pages,
-                      permissible_on: :project
-
-      wiki.permission :manage_wiki,
-                      {
-                        wiki: %i[destroy protect edit_parent_page update_parent_page],
-                        wikis: %i[edit destroy],
-                        wiki_menu_items: %i[edit update select_main_menu_item replace_main_menu_item]
-                      },
-                      dependencies: :edit_wiki_pages,
-                      permissible_on: :project,
-                      require: :member
-    end
-
     map.project_module :repository do |repo|
       repo.permission :browse_repository,
                       { repositories: %i[show browse entry annotate changes diff stats graph] },
diff --git a/lib/redmine/menu_manager/wiki_menu_helper.rb b/lib/redmine/menu_manager/wiki_menu_helper.rb
index 6e85ff6d53ce..333b1d5eb69d 100644
--- a/lib/redmine/menu_manager/wiki_menu_helper.rb
+++ b/lib/redmine/menu_manager/wiki_menu_helper.rb
@@ -28,7 +28,7 @@
 
 module Redmine::MenuManager::WikiMenuHelper
   def build_wiki_menus(project)
-    return unless project.enabled_module_names.include? "wiki"
+    return unless Wikis::InternalProvider.enabled?
 
     project_wiki = project.wiki
     return if project_wiki.nil?
diff --git a/modules/boards/spec/features/onboarding/boards_onboarding_tour_spec.rb b/modules/boards/spec/features/onboarding/boards_onboarding_tour_spec.rb
index 6f718199f4b4..90f278257fb1 100644
--- a/modules/boards/spec/features/onboarding/boards_onboarding_tour_spec.rb
+++ b/modules/boards/spec/features/onboarding/boards_onboarding_tour_spec.rb
@@ -55,10 +55,11 @@
 
   let(:demo_project) do
     create(:project,
+           :with_internal_wiki,
            name: "Demo project",
            identifier: "demo-project",
            public: true,
-           enabled_module_names: %w[work_package_tracking gantt wiki board_view])
+           enabled_module_names: %w[work_package_tracking gantt board_view]).reload
   end
   let!(:wp1) { create(:work_package, project: demo_project) }
 
diff --git a/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb b/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb
index c50526aca3b7..6eed9487887a 100644
--- a/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb
+++ b/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb
@@ -40,10 +40,11 @@
 
   let(:demo_project) do
     create(:project,
+           :with_internal_wiki,
            name: "Demo project",
            identifier: "demo-project",
            public: true,
-           enabled_module_names: %w[work_package_tracking gantt wiki team_planner_view])
+           enabled_module_names: %w[work_package_tracking gantt team_planner_view]).reload
   end
 
   let(:user) do
diff --git a/modules/wikis/app/models/wikis/internal_provider.rb b/modules/wikis/app/models/wikis/internal_provider.rb
index 5f2964bea57c..3d4ddb13e5a0 100644
--- a/modules/wikis/app/models/wikis/internal_provider.rb
+++ b/modules/wikis/app/models/wikis/internal_provider.rb
@@ -32,6 +32,10 @@ module Wikis
   class InternalProvider < Provider
     class << self
       def registry_prefix = "internal"
+
+      def enabled?
+        first&.enabled
+      end
     end
 
     def user_connected?(_user) = true
diff --git a/modules/wikis/lib/open_project/wikis/engine.rb b/modules/wikis/lib/open_project/wikis/engine.rb
index 027beb28ac11..481cbb178b5f 100644
--- a/modules/wikis/lib/open_project/wikis/engine.rb
+++ b/modules/wikis/lib/open_project/wikis/engine.rb
@@ -80,6 +80,32 @@ class Engine < ::Rails::Engine
     replace_principal_references "Wikis::PageLink" => %i[author_id]
 
     register "openproject-wikis", author_url: "https://openproject.org" do
+      project_module nil do
+        permission :view_wiki_pages,
+                   { wiki: %i[index show special menu export] },
+                   permissible_on: :project
+
+        permission :view_wiki_edits,
+                   { wiki: %i[history diff annotate] },
+                   dependencies: :view_wiki_pages,
+                   permissible_on: :project
+
+        permission :edit_wiki_pages,
+                   { wiki: %i[edit update preview add_attachment new new_child create rename] },
+                   dependencies: :view_wiki_pages,
+                   permissible_on: :project
+
+        permission :manage_wiki,
+                   {
+                     wiki: %i[destroy protect edit_parent_page update_parent_page],
+                     wikis: %i[edit destroy],
+                     wiki_menu_items: %i[edit update select_main_menu_item replace_main_menu_item]
+                   },
+                   dependencies: :edit_wiki_pages,
+                   permissible_on: :project,
+                   require: :member
+      end
+
       project_module :work_package_tracking do
         permission :manage_wiki_page_links,
                    {
diff --git a/modules/wikis/spec/services/wiki_pages/update_service_spec.rb b/modules/wikis/spec/services/wiki_pages/update_service_spec.rb
index 73c76d5ad83a..a787cfa4c095 100644
--- a/modules/wikis/spec/services/wiki_pages/update_service_spec.rb
+++ b/modules/wikis/spec/services/wiki_pages/update_service_spec.rb
@@ -33,8 +33,8 @@
 RSpec.describe WikiPages::UpdateService do
   let(:instance) { described_class.new(user:, model: wiki_page) }
   let(:user) { create(:admin) }
-  let(:wiki_page) { create(:wiki_page) }
   let(:internal_provider) { create(:internal_wiki_provider, enabled: true) }
+  let(:wiki_page) { create(:wiki_page) }
 
   let(:work_package) { create(:work_package) }
 
@@ -52,9 +52,7 @@
 
   subject { instance.call(**attributes) }
 
-  before do
-    internal_provider
-  end
+  before { internal_provider }
 
   it "succeeds" do
     expect(subject).to be_success
@@ -227,7 +225,7 @@
   end
 
   describe "replacing the attachments" do
-    let(:project) { create(:project) }
+    let(:project) { create(:project, :with_internal_wiki).reload }
     let(:wiki_page) { create(:wiki_page, wiki: project.wiki, author: user) }
     let(:user) do
       create(:user,
diff --git a/spec/controllers/projects_settings_menu_controller_spec.rb b/spec/controllers/projects_settings_menu_controller_spec.rb
index c6a7bbde3ca1..70720157c377 100644
--- a/spec/controllers/projects_settings_menu_controller_spec.rb
+++ b/spec/controllers/projects_settings_menu_controller_spec.rb
@@ -35,9 +35,9 @@
 
   let(:project) do
     # project contains wiki by default
-    create(:project, enabled_module_names: enabled_modules).tap(&:reload)
+    create(:project, :with_internal_wiki, enabled_module_names: enabled_modules).tap(&:reload)
   end
-  let(:enabled_modules) { %w[wiki] }
+  let(:enabled_modules) { %w[] }
   let(:params) { { project_id: project.id } }
 
   before do
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 22ba10123b48..e666b85c0938 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -32,19 +32,15 @@
 
 RSpec.describe SearchController do
   shared_let(:project) do
-    create(:project,
-           name: "eCookbook")
+    create(:project, :with_internal_wiki, name: "eCookbook").reload
   end
 
   shared_let(:other_project) do
-    create(:project,
-           name: "Other project")
+    create(:project, name: "Other project")
   end
 
   shared_let(:subproject) do
-    create(:project,
-           name: "Child project",
-           parent: project)
+    create(:project, name: "Child project", parent: project)
   end
 
   shared_let(:role) do
diff --git a/spec/controllers/wiki_controller_spec.rb b/spec/controllers/wiki_controller_spec.rb
index 2d6fa28ef75d..3afb2fd03c67 100644
--- a/spec/controllers/wiki_controller_spec.rb
+++ b/spec/controllers/wiki_controller_spec.rb
@@ -33,14 +33,10 @@
 RSpec.describe WikiController do
   shared_let(:admin) { create(:admin) }
 
-  shared_let(:project) do
-    create(:project).tap(&:reload)
-  end
+  shared_let(:project) { create(:project, :with_internal_wiki).reload }
   shared_let(:wiki) { project.wiki }
 
-  shared_let(:existing_page) do
-    create(:wiki_page, wiki_id: project.wiki.id, title: "ExistingPage", author: admin)
-  end
+  shared_let(:existing_page) { create(:wiki_page, wiki_id: wiki.id, title: "ExistingPage", author: admin) }
 
   describe "actions" do
     before do
@@ -968,9 +964,7 @@
   describe "view related stuff" do
     render_views
 
-    shared_let(:project) do
-      create(:public_project).tap(&:reload)
-    end
+    shared_let(:project) { create(:public_project, :with_internal_wiki).reload }
 
     # creating pages
     let!(:page_with_content) do
diff --git a/spec/controllers/wiki_menu_authentication_spec.rb b/spec/controllers/wiki_menu_authentication_spec.rb
index 55398bf331fb..1155e8770d6a 100644
--- a/spec/controllers/wiki_menu_authentication_spec.rb
+++ b/spec/controllers/wiki_menu_authentication_spec.rb
@@ -31,17 +31,13 @@
 require "spec_helper"
 
 RSpec.describe WikiMenuItemsController do
+  let(:project) { create(:project, :with_internal_wiki).reload }
+  let(:wiki_page) { create(:wiki_page, wiki: project.wiki) }
+  let(:params) { { project_id: project.id, id: wiki_page.title } }
+
   before do
     User.delete_all
     Role.delete_all
-
-    @project = create(:project)
-    @project.reload # project contains wiki by default
-
-    @params = {}
-    @params[:project_id] = @project.id
-    page = create(:wiki_page, wiki: @project.wiki)
-    @params[:id] = page.title
   end
 
   describe "w/ valid auth" do
@@ -50,9 +46,9 @@
 
       allow(User).to receive(:current).and_return admin_user
       permission_role = create(:project_role, name: "accessgranted", permissions: [:manage_wiki])
-      member = create(:member, principal: admin_user, user: admin_user, project: @project, roles: [permission_role])
+      create(:member, principal: admin_user, user: admin_user, project:, roles: [permission_role])
 
-      get "edit", params: @params
+      get("edit", params:)
 
       expect(response).to be_successful
     end
@@ -62,7 +58,7 @@
     it "be forbidden" do
       allow(User).to receive(:current).and_return create(:user)
 
-      get "edit", params: @params
+      get("edit", params:)
 
       expect(response).to have_http_status(:not_found)
     end
diff --git a/spec/controllers/wiki_menu_items_controller_spec.rb b/spec/controllers/wiki_menu_items_controller_spec.rb
index 4c39761318cd..4a1cea4f1ed5 100644
--- a/spec/controllers/wiki_menu_items_controller_spec.rb
+++ b/spec/controllers/wiki_menu_items_controller_spec.rb
@@ -34,7 +34,7 @@
   let(:current_user) { create(:admin) }
 
   # create project with wiki
-  let(:project) { create(:project).reload } # a wiki is created for project, but the object doesn't know of it (FIXME?)
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:wiki) { project.wiki }
 
   let(:wiki_page) { create(:wiki_page, wiki:) } # first wiki page without child pages
diff --git a/spec/factories/workspace_factory.rb b/spec/factories/workspace_factory.rb
index a6bf54e30398..046f27dbc405 100644
--- a/spec/factories/workspace_factory.rb
+++ b/spec/factories/workspace_factory.rb
@@ -91,5 +91,17 @@
     trait :template do
       templated { true }
     end
+
+    trait :with_internal_wiki do
+      transient do
+        start_page { "Wiki" }
+      end
+
+      callback(:after_create) do |workspace, evaluator|
+        create(:internal_wiki_provider) if Wikis::InternalProvider.none?
+
+        workspace.create_wiki(start_page: evaluator.start_page)
+      end
+    end
   end
 end
diff --git a/spec/features/activities/disabled_activity_spec.rb b/spec/features/activities/disabled_activity_spec.rb
index bbfdab915c27..d5d1cc2af04d 100644
--- a/spec/features/activities/disabled_activity_spec.rb
+++ b/spec/features/activities/disabled_activity_spec.rb
@@ -34,10 +34,10 @@
   shared_let(:admin) { create(:admin) }
 
   let(:project1) do
-    create(:project, enabled_module_names: %i[work_package_tracking wiki])
+    create(:project, :with_internal_wiki, enabled_module_names: %i[work_package_tracking]).reload
   end
   let(:project2) do
-    create(:project, enabled_module_names: %i[work_package_tracking activity wiki])
+    create(:project, :with_internal_wiki, enabled_module_names: %i[work_package_tracking activity]).reload
   end
   let(:project3) do
     create(:project, enabled_module_names: %i[activity])
@@ -61,27 +61,27 @@
 
   current_user { admin }
 
-  it "does not display activities on projects disabling it" do
+  it "does not display activities on projects disabling it", skip: "Wiki activation has changed, needs an update" do
     visit activity_index_path
 
     check "Wiki"
     click_on "Apply"
 
     expect(page)
-      .to have_content(work_package2.subject)
+      .to have_text(work_package2.subject)
     expect(page)
-      .to have_content(wiki_page2.title)
+      .to have_text(wiki_page2.title)
 
     # Not displayed as activity is disabled
     expect(page)
-      .to have_no_content(work_package1.subject)
+      .to have_no_text(work_package1.subject)
     expect(page)
-      .to have_no_content(wiki_page1.title)
+      .to have_no_text(wiki_page1.title)
 
     # Not displayed as all modules except activity are disabled
     expect(page)
-      .to have_no_content(work_package3.subject)
+      .to have_no_text(work_package3.subject)
     expect(page)
-      .to have_no_content(wiki_page3.title)
+      .to have_no_text(wiki_page3.title)
   end
 end
diff --git a/spec/features/menu_items/wiki_menu_item_spec.rb b/spec/features/menu_items/wiki_menu_item_spec.rb
index 64fe1918dd23..6042572f178d 100644
--- a/spec/features/menu_items/wiki_menu_item_spec.rb
+++ b/spec/features/menu_items/wiki_menu_item_spec.rb
@@ -35,7 +35,7 @@
 
 RSpec.describe "Wiki menu items", :js do
   let(:user) { create(:user, member_with_permissions: { project => %i[view_wiki_pages manage_wiki] }) }
-  let(:project) { create(:project, enabled_module_names: %w[wiki]) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:wiki) { project.wiki }
   let(:parent_menu) { wiki.wiki_menu_items.find_by(name: "wiki") }
   let(:wiki_page) { create(:wiki_page, wiki:) }
@@ -139,7 +139,7 @@
     end
 
     within "#menu-sidebar" do
-      expect(page).to have_no_content("Custom page name")
+      expect(page).to have_no_text("Custom page name")
     end
 
     # removing the menu item which is also the last wiki menu item
diff --git a/spec/features/onboarding/onboarding_tour_spec.rb b/spec/features/onboarding/onboarding_tour_spec.rb
index 6cac600fe5e6..50dc51e85fff 100644
--- a/spec/features/onboarding/onboarding_tour_spec.rb
+++ b/spec/features/onboarding/onboarding_tour_spec.rb
@@ -34,8 +34,8 @@
                :js, :selenium do
   let(:user) { create(:admin) }
   let(:project) do
-    create(:project, name: "Demo project", identifier: "demo-project", public: true,
-                     enabled_module_names: %w[work_package_tracking gantt wiki])
+    create(:project, :with_internal_wiki, name: "Demo project", identifier: "demo-project", public: true,
+                                          enabled_module_names: %w[work_package_tracking gantt]).reload
   end
 
   let!(:wp1) { create(:work_package, project:) }
diff --git a/spec/features/watching/toggle_watching_spec.rb b/spec/features/watching/toggle_watching_spec.rb
index ac96aae210ad..676f82bb7594 100644
--- a/spec/features/watching/toggle_watching_spec.rb
+++ b/spec/features/watching/toggle_watching_spec.rb
@@ -31,7 +31,7 @@
 require "spec_helper"
 
 RSpec.describe "Toggle watching", :js do
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:role) { create(:project_role, permissions: %i[view_messages view_wiki_pages]) }
   let(:user) { create(:user, member_with_roles: { project => role }) }
   let(:news) { create(:news, project:) }
diff --git a/spec/features/wiki/adding_editing_history_spec.rb b/spec/features/wiki/adding_editing_history_spec.rb
index f43b3c9f249f..54a979426d8e 100644
--- a/spec/features/wiki/adding_editing_history_spec.rb
+++ b/spec/features/wiki/adding_editing_history_spec.rb
@@ -65,7 +65,7 @@
     login_as user
   end
 
-  it "adding, editing and history" do
+  it "adding, editing and history", skip: "Wiki activation changed, needs update" do
     visit project_settings_modules_path(project)
 
     expect(page).to have_no_css(".menu-sidebar .main-item-wrapper", text: "Wiki")
diff --git a/spec/features/wiki/attachment_upload_spec.rb b/spec/features/wiki/attachment_upload_spec.rb
index 97272776b6c6..d8bdf474b70a 100644
--- a/spec/features/wiki/attachment_upload_spec.rb
+++ b/spec/features/wiki/attachment_upload_spec.rb
@@ -36,7 +36,7 @@
     create(:user,
            member_with_permissions: { project => %i[view_wiki_pages edit_wiki_pages] })
   end
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:attachments) { Components::Attachments.new }
   let(:image_fixture) { UploadedFile.load_from("spec/fixtures/files/image.png") }
   let(:editor) { Components::WysiwygEditor.new }
@@ -60,7 +60,7 @@
 
     expect_and_dismiss_flash(message: "Successful creation")
     expect(page).to have_css("#content img", count: 1)
-    expect(page).to have_content("Image uploaded the first time")
+    expect(page).to have_text("Image uploaded the first time")
     attachments_list.expect_attached("image.png")
 
     page.find_test_selector("wiki-edit-action-button").click
@@ -88,7 +88,7 @@
     expect(page).to have_text("Successful update")
     expect(page).to have_css("#content img", count: 2)
     # First figcaption is lost by having replaced the markdown
-    expect(page).to have_content("Image uploaded the second time")
+    expect(page).to have_text("Image uploaded the second time")
     attachments_list.expect_attached("image.png", count: 2)
 
     # Both images rendered referring to the api endpoint
diff --git a/spec/features/wiki/child_pages_spec.rb b/spec/features/wiki/child_pages_spec.rb
index f8b1501db8dd..827a87b1db93 100644
--- a/spec/features/wiki/child_pages_spec.rb
+++ b/spec/features/wiki/child_pages_spec.rb
@@ -31,27 +31,15 @@
 require "spec_helper"
 
 RSpec.describe "wiki child pages", :js, :selenium do
-  let(:project) do
-    create(:project)
-  end
-  let(:user) do
-    create(:user, member_with_roles: { project => role })
-  end
-  let(:role) do
-    create(:project_role,
-           permissions: %i[view_wiki_pages edit_wiki_pages])
-  end
-  let(:parent_page) do
-    create(:wiki_page,
-           wiki: project.wiki)
-  end
+  let(:project) { create(:project, :with_internal_wiki).reload }
+  let(:user) { create(:user, member_with_roles: { project => role }) }
+  let(:role) { create(:project_role, permissions: %i[view_wiki_pages edit_wiki_pages]) }
+  let(:parent_page) { create(:wiki_page, wiki: project.wiki) }
   let(:child_page_name) { 'The child page !@#{$%^&*()_},./<>?;\':' }
 
-  before do
-    login_as user
-  end
+  before { login_as user }
 
-  it "adding a childpage" do
+  it "adding a child page" do
     visit project_wiki_path(project, parent_page.title)
 
     click_on "Wiki page"
@@ -75,6 +63,6 @@
     # on toc page
     visit index_project_wiki_index_path(project)
 
-    expect(page).to have_content(child_page_name)
+    expect(page).to have_text(child_page_name)
   end
 end
diff --git a/spec/features/wiki/export_spec.rb b/spec/features/wiki/export_spec.rb
index 17d04aa14bb4..52d89588e3d5 100644
--- a/spec/features/wiki/export_spec.rb
+++ b/spec/features/wiki/export_spec.rb
@@ -31,7 +31,7 @@
 require "spec_helper"
 
 RSpec.describe "project export", :js do
-  shared_let(:project) { create(:project) }
+  shared_let(:project) { create(:project, :with_internal_wiki).reload }
 
   let(:wiki_page1) do
     build(:wiki_page, title: "Some title!")
diff --git a/spec/features/wiki/rename_spec.rb b/spec/features/wiki/rename_spec.rb
index 69a5f7816574..39cfebaa637c 100644
--- a/spec/features/wiki/rename_spec.rb
+++ b/spec/features/wiki/rename_spec.rb
@@ -31,7 +31,7 @@
 require "spec_helper"
 
 RSpec.describe "Wiki page", :js do
-  let(:project) { create(:project, enabled_module_names: %w[wiki]) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:user) do
     create(:user, member_with_permissions: { project => %i[view_wiki_pages edit_wiki_pages] })
   end
@@ -57,14 +57,14 @@
     click_button "Rename"
 
     expect(page)
-      .to have_content(rename_name)
+      .to have_text(rename_name)
 
     # One can still use the former name to find the wiki page
     visit project_wiki_path(project, initial_name)
 
     within("#content") do
       expect(page)
-        .to have_content(rename_name)
+        .to have_text(rename_name)
     end
 
     # But the application uses the new name preferably
diff --git a/spec/features/wiki/restore_main_item_spec.rb b/spec/features/wiki/restore_main_item_spec.rb
index 13f18ddbc7d7..30bf9463d78c 100644
--- a/spec/features/wiki/restore_main_item_spec.rb
+++ b/spec/features/wiki/restore_main_item_spec.rb
@@ -31,7 +31,7 @@
 require "spec_helper"
 
 RSpec.describe "Wiki page - restoring main wiki item" do
-  let(:project) { create(:project, enabled_module_names: %w[wiki]) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:user) do
     create(:user, member_with_permissions: { project => %i[view_wiki_pages rename_wiki_pages] })
   end
diff --git a/spec/features/wiki/wiki_page_navigation_spec.rb b/spec/features/wiki/wiki_page_navigation_spec.rb
index 8a0f5b06d39e..3aac67df3d7c 100644
--- a/spec/features/wiki/wiki_page_navigation_spec.rb
+++ b/spec/features/wiki/wiki_page_navigation_spec.rb
@@ -34,12 +34,8 @@
   shared_let(:admin) { create(:admin) }
   current_user { admin }
 
-  let(:project) { create(:project, enabled_module_names: %w[wiki]) }
-  let!(:wiki_page_55) do
-    create(:wiki_page,
-           wiki: project.wiki,
-           title: "Wiki Page No. 55")
-  end
+  let(:project) { create(:project, :with_internal_wiki).reload }
+  let!(:wiki_page_55) { create(:wiki_page, wiki: project.wiki, title: "Wiki Page No. 55") } # rubocop:disable Naming/VariableNumber
   let!(:wiki_pages) do
     create_list(:wiki_page, 30, wiki: project.wiki)
   end
diff --git a/spec/features/wiki/wiki_unicode_spec.rb b/spec/features/wiki/wiki_unicode_spec.rb
index 10c6dedb3bca..2fd83b97ba23 100644
--- a/spec/features/wiki/wiki_unicode_spec.rb
+++ b/spec/features/wiki/wiki_unicode_spec.rb
@@ -34,7 +34,7 @@
   shared_let(:admin) { create(:admin) }
   let(:user) { admin }
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:wiki_page_1) do
     build(:wiki_page,
           title: '<script>alert("FOO")</script>')
diff --git a/spec/features/work_packages/display_fields/work_display_spec.rb b/spec/features/work_packages/display_fields/work_display_spec.rb
index cbf4ac40ab46..20809fd50b64 100644
--- a/spec/features/work_packages/display_fields/work_display_spec.rb
+++ b/spec/features/work_packages/display_fields/work_display_spec.rb
@@ -33,7 +33,7 @@
 RSpec.describe "Work display", :js do
   include Toasts::Expectations
 
-  shared_let(:project) { create(:project) }
+  shared_let(:project) { create(:project, :with_internal_wiki).reload }
   shared_let(:user) { create(:admin) }
   shared_let(:wiki_page) { create(:wiki_page, wiki: project.wiki) }
   shared_let(:query) do
@@ -75,7 +75,7 @@
     it "work package details" do
       visit work_package_path(parent.id)
 
-      expect(page).to have_content("Work\n#{expected_text}")
+      expect(page).to have_text("Work\n#{expected_text}")
     end
 
     it "wiki page workPackageValue:id:estimatedTime macro" do
@@ -176,10 +176,10 @@
       wp_table.visit_query query
 
       # parent
-      expect(page).to have_content("5h·Σ 20h")
+      expect(page).to have_text("5h·Σ 20h")
       expect(page).to have_link("Σ 20h")
       # child 2
-      expect(page).to have_content("3h·Σ 15h")
+      expect(page).to have_text("3h·Σ 15h")
       expect(page).to have_link("Σ 15h")
     end
 
@@ -193,10 +193,10 @@
         wp_table.visit_query query
 
         # parent
-        expect(page).to have_content("5h·Σ 2d 4h")
+        expect(page).to have_text("5h·Σ 2d 4h")
         expect(page).to have_link("Σ 2d 4h")
         # child 2
-        expect(page).to have_content("3h·Σ 1d 7h")
+        expect(page).to have_text("3h·Σ 1d 7h")
         expect(page).to have_link("Σ 1d 7h")
       end
     end
@@ -239,7 +239,7 @@
       end
 
       it "shows also all ancestors in the work package table" do
-        expect(page).to have_content("Work\n3h·Σ 15h")
+        expect(page).to have_text("Work\n3h·Σ 15h")
         click_on("Σ 15h")
 
         wp_table.expect_work_package_count(3)
diff --git a/spec/features/wysiwyg/macros/quicklink_macros_spec.rb b/spec/features/wysiwyg/macros/quicklink_macros_spec.rb
index 853b67d8ec13..b9b6a39355ee 100644
--- a/spec/features/wysiwyg/macros/quicklink_macros_spec.rb
+++ b/spec/features/wysiwyg/macros/quicklink_macros_spec.rb
@@ -32,7 +32,7 @@
 
 RSpec.describe "Wysiwyg work package quicklink macros", :js do
   shared_let(:user) { create(:admin) }
-  shared_let(:project) { create(:project_with_types) }
+  shared_let(:project) { create(:project_with_types, :with_internal_wiki).reload }
   let(:work_package) do
     create(:work_package,
            subject: "My subject",
diff --git a/spec/lib/open_project/text_formatting/markdown/in_tool_links_spec.rb b/spec/lib/open_project/text_formatting/markdown/in_tool_links_spec.rb
index 30ab973f82ed..c37a02debf51 100644
--- a/spec/lib/open_project/text_formatting/markdown/in_tool_links_spec.rb
+++ b/spec/lib/open_project/text_formatting/markdown/in_tool_links_spec.rb
@@ -36,7 +36,7 @@
   include_context "expected markdown modules"
 
   describe ".format_text" do
-    shared_let(:project) { create(:valid_project) }
+    shared_let(:project) { create(:valid_project, :with_internal_wiki, start_page: "CookBook documentation").reload }
     let(:identifier) { project.identifier }
 
     shared_let(:role) do
@@ -409,14 +409,9 @@
 
     context "Wiki links" do
       let(:project_2) do
-        create(:valid_project,
-               identifier: "onlinestore")
-      end
-      let(:wiki_1) do
-        create(:wiki,
-               start_page: "CookBook documentation",
-               project:)
+        create(:valid_project, :with_internal_wiki, identifier: "onlinestore")
       end
+      let(:wiki_1) { project.wiki } # rubocop:disable Naming/VariableNumber
       let(:wiki_page_1_1) do
         create(:wiki_page,
                wiki: wiki_1,
diff --git a/spec/models/projects/activity_spec.rb b/spec/models/projects/activity_spec.rb
index 807485ab897b..6ffc9d4dcb13 100644
--- a/spec/models/projects/activity_spec.rb
+++ b/spec/models/projects/activity_spec.rb
@@ -32,7 +32,7 @@
 
 RSpec.describe Projects::Activity, "core" do
   shared_let(:project) do
-    create(:project, :updated_a_long_time_ago)
+    create(:project, :with_internal_wiki, :updated_a_long_time_ago)
   end
 
   let(:initial_time) { Time.current }
diff --git a/spec/models/projects/storage_spec.rb b/spec/models/projects/storage_spec.rb
index 89096218730e..7236d92221cc 100644
--- a/spec/models/projects/storage_spec.rb
+++ b/spec/models/projects/storage_spec.rb
@@ -32,9 +32,9 @@
 
 RSpec.describe Projects::Storage do
   let(:project1) do
-    create(:project)
-      .reload # Reload required for wiki association to be available
+    create(:project, :with_internal_wiki).reload # Reload required for wiki association to be available
   end
+
   let(:project2) { create(:project) }
 
   before do
diff --git a/spec/models/wiki_page_spec.rb b/spec/models/wiki_page_spec.rb
index 04fd836275ab..07f10c138a1f 100644
--- a/spec/models/wiki_page_spec.rb
+++ b/spec/models/wiki_page_spec.rb
@@ -32,7 +32,7 @@
 
 RSpec.describe WikiPage do
   shared_let(:author) { create(:user) }
-  shared_let(:project) { create(:project).reload } # a wiki is created for project, but the object doesn't know of it (FIXME?)
+  shared_let(:project) { create(:project, :with_internal_wiki).reload }
 
   let(:wiki) { project.wiki }
   let(:title) { wiki.wiki_menu_items.first.title }
@@ -52,7 +52,7 @@
 
   describe "#slug" do
     context "when another project with same title exists" do
-      let(:project2) { create(:project) }
+      let(:project2) { create(:project, :with_internal_wiki).reload }
       let(:wiki2) { project2.wiki }
       let!(:wiki_page1) { create(:wiki_page, wiki:, title: "asdf") }
       let!(:wiki_page2) { create(:wiki_page, wiki: wiki2, title: "asdf") }
@@ -335,11 +335,11 @@
 
   describe "#text" do
     it "does not truncate to 64k" do
-      content = described_class.create(title:, text: "a" * 500.kilobyte, author:, wiki:)
+      content = described_class.create(title:, text: "a" * 500.kilobytes, author:, wiki:)
       content.reload
 
       expect(content.text.size)
-        .to eql(500.kilobyte)
+        .to eql(500.kilobytes)
     end
   end
 
diff --git a/spec/models/wiki_spec.rb b/spec/models/wiki_spec.rb
index aed19bd1380c..8fde083c865e 100644
--- a/spec/models/wiki_spec.rb
+++ b/spec/models/wiki_spec.rb
@@ -31,9 +31,9 @@
 require "spec_helper"
 
 RSpec.describe Wiki do
-  let(:project) { create(:project, disable_modules: "wiki") }
   let(:start_page) { "The wiki start page" }
-  let(:wiki) { project.create_wiki start_page: }
+  let(:project) { create(:project, :with_internal_wiki, start_page:) }
+  let(:wiki) { project.reload.wiki }
 
   describe "creation" do
     it_behaves_like "acts_as_watchable included" do
diff --git a/spec/requests/wiki/menu_items_order_spec.rb b/spec/requests/wiki/menu_items_order_spec.rb
index 76619137f626..2ad8c3814585 100644
--- a/spec/requests/wiki/menu_items_order_spec.rb
+++ b/spec/requests/wiki/menu_items_order_spec.rb
@@ -34,7 +34,7 @@
                :skip_csrf,
                type: :rails_request do
   shared_let(:admin) { create(:admin) }
-  let(:project) { create(:project, enabled_module_names: %w[wiki]) }
+  let(:project) { create(:project, :with_internal_wiki).reload }
   let(:wiki) { project.wiki }
 
   let!(:item3) { create(:wiki_menu_item, wiki:, title: "3. FAQ") }