diff --git a/spec/factories/export_template.rb b/spec/factories/export_template.rb
index 0f4e8d882..54ce224e5 100644
--- a/spec/factories/export_template.rb
+++ b/spec/factories/export_template.rb
@@ -11,24 +11,36 @@ FactoryBot.define do
       { "type" => "paragraph", "content" => [{ "text" => "export_", "type" => "text" }, { "type" => "mention", "attrs" => { "id" => "dossier_id", "label" => "id dossier" } }, { "text" => " .pdf", "type" => "text" }] }
     ]
    },
- "default_dossier_directory" =>
- {
-   "type" => "doc",
-  "content" =>
- [
-   {
-     "type" => "paragraph",
-      "content" =>
-    [
-      { "text" => "dossier_", "type" => "text" },
-      { "type" => "mention", "attrs" => { "id" => "dossier_number", "label" => "numéro du dossier" } },
-      { "text" => " ", "type" => "text" }
-    ]
+   "default_dossier_directory" => {
+     "type" => "doc",
+     "content" =>
+     [
+       {
+         "type" => "paragraph",
+         "content" =>
+         [
+           { "text" => "dossier_", "type" => "text" },
+           { "type" => "mention", "attrs" => { "id" => "dossier_number", "label" => "numéro du dossier" } },
+           { "text" => " ", "type" => "text" }
+         ]
+       }
+     ]
    }
- ]
- }
   }
 }
     kind { "zip" }
+
+    to_create do |export_template, _context|
+      export_template.set_default_values
+      export_template.save
+    end
+
+    trait :with_custom_content do
+      to_create do |export_template, context|
+        export_template.set_default_values
+        export_template.content = context.content
+        export_template.save
+      end
+    end
   end
 end
diff --git a/spec/models/export_template_spec.rb b/spec/models/export_template_spec.rb
index f0602597a..529de503b 100644
--- a/spec/models/export_template_spec.rb
+++ b/spec/models/export_template_spec.rb
@@ -1,6 +1,6 @@
 describe ExportTemplate do
   let(:groupe_instructeur) { create(:groupe_instructeur, procedure:) }
-  let(:export_template) { create(:export_template, groupe_instructeur:, content:) }
+  let(:export_template) { create(:export_template, :with_custom_content, groupe_instructeur:, content:) }
   let(:procedure) { create(:procedure_with_dossiers, types_de_champ_public:, for_individual:) }
   let(:dossier) { procedure.dossiers.first }
   let(:for_individual) { false }
diff --git a/spec/services/pieces_justificatives_service_spec.rb b/spec/services/pieces_justificatives_service_spec.rb
index 3f750829b..bdfe28911 100644
--- a/spec/services/pieces_justificatives_service_spec.rb
+++ b/spec/services/pieces_justificatives_service_spec.rb
@@ -110,7 +110,7 @@ describe PiecesJustificativesService do
         it { expect(subject).to match_array(pj_champ.call(dossier).piece_justificative_file.attachments) }
 
         context 'with export_template' do
-          let(:export_template) { create(:export_template, groupe_instructeur: procedure.defaut_groupe_instructeur).tap(&:set_default_values) }
+          let(:export_template) { create(:export_template, groupe_instructeur: procedure.defaut_groupe_instructeur) }
           it { expect(subject).to match_array(pj_champ.call(dossier).piece_justificative_file.attachments) }
         end
       end
diff --git a/spec/services/procedure_export_service_spec.rb b/spec/services/procedure_export_service_spec.rb
index b463675be..0c03cfd98 100644
--- a/spec/services/procedure_export_service_spec.rb
+++ b/spec/services/procedure_export_service_spec.rb
@@ -529,7 +529,7 @@ describe ProcedureExportService do
       context 'with export_template' do
         let!(:dossier) { create(:dossier, :accepte, :with_populated_champs, :with_individual, procedure: procedure) }
         let(:dossier_exports) { PiecesJustificativesService.new(user_profile: instructeur, export_template:).generate_dossiers_export(Dossier.where(id: dossier)) }
-        let(:export_template) { create(:export_template, groupe_instructeur: procedure.defaut_groupe_instructeur).tap(&:set_default_values) }
+        let(:export_template) { create(:export_template, groupe_instructeur: procedure.defaut_groupe_instructeur) }
         before do
           allow_any_instance_of(ActiveStorage::Attachment).to receive(:url).and_return("https://opengraph.githubassets.com/d0e7862b24d8026a3c03516d865b28151eb3859029c6c6c2e86605891fbdcd7a/socketry/async-io")
         end
diff --git a/spec/services/procedure_export_service_zip_spec.rb b/spec/services/procedure_export_service_zip_spec.rb
index 0daced35e..14e5ceaad 100644
--- a/spec/services/procedure_export_service_zip_spec.rb
+++ b/spec/services/procedure_export_service_zip_spec.rb
@@ -2,7 +2,7 @@ describe ProcedureExportService do
   let(:instructeur) { create(:instructeur) }
   let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :piece_justificative, libelle: 'pj' }, { type: :repetition, children: [{ type: :piece_justificative, libelle: 'repet_pj' }] }]) }
   let(:dossiers) { create_list(:dossier, 10, procedure: procedure) }
-  let(:export_template) { create(:export_template, groupe_instructeur: procedure.defaut_groupe_instructeur).tap(&:set_default_values) }
+  let(:export_template) { create(:export_template, groupe_instructeur: procedure.defaut_groupe_instructeur) }
   let(:service) { ProcedureExportService.new(procedure, procedure.dossiers, instructeur, export_template) }
 
   def pj_champ(d) = d.champs_public.find_by(type: 'Champs::PieceJustificativeChamp')