diff --git a/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb b/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb
new file mode 100644
index 000000000..83079adc6
--- /dev/null
+++ b/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb
@@ -0,0 +1,172 @@
+include ActionDispatch::TestProcess
+
+describe NewAdministrateur::AttestationTemplatesController, type: :controller do
+  let!(:attestation_template) { create(:attestation_template) }
+  let(:admin) { create(:administrateur) }
+  let!(:procedure) { create :procedure, administrateur: admin, attestation_template: attestation_template }
+  let(:logo) { fixture_file_upload('spec/fixtures/files/white.png', 'image/png') }
+  let(:logo2) { fixture_file_upload('spec/fixtures/files/white.png', 'image/png') }
+  let(:signature) { fixture_file_upload('spec/fixtures/files/black.png', 'image/png') }
+  let(:signature2) { fixture_file_upload('spec/fixtures/files/black.png', 'image/png') }
+  let(:interlaced_logo) { fixture_file_upload('spec/fixtures/files/interlaced-black.png', 'image/png') }
+  let(:uninterlaced_logo) { fixture_file_upload('spec/fixtures/files/uninterlaced-black.png', 'image/png') }
+  let(:invalid_logo) { fixture_file_upload('spec/fixtures/files/invalid_file_format.json', 'application/json') }
+
+  before do
+    sign_in(admin.user)
+    Timecop.freeze(Time.zone.now)
+  end
+
+  after { Timecop.return }
+
+  shared_examples 'rendering a PDF successfully' do
+    render_views
+    it 'renders a PDF' do
+      expect(subject.status).to eq(200)
+      expect(subject.content_type).to eq('application/pdf')
+    end
+  end
+
+  describe 'GET #preview' do
+    let(:attestation_params) do
+      { title: 't', body: 'b', footer: 'f' }
+    end
+
+    before do
+      get :preview,
+        params: {
+          procedure_id: procedure.id
+        }
+      procedure.reload
+    end
+
+    context 'if an attestation template exists on the procedure' do
+      after { procedure.attestation_template.destroy }
+
+      context 'with images' do
+        let!(:attestation_template) do
+          create(:attestation_template, attestation_params.merge(logo: logo, signature: signature))
+        end
+
+        it { expect(assigns(:attestation)).to include(attestation_params) }
+        it { expect(assigns(:attestation)[:created_at]).to eq(Time.zone.now) }
+        it { expect(assigns(:attestation)[:logo].download).to eq(logo2.read) }
+        it { expect(assigns(:attestation)[:signature].download).to eq(signature2.read) }
+        it_behaves_like 'rendering a PDF successfully'
+      end
+
+      context 'without images' do
+        let!(:attestation_template) do
+          create(:attestation_template, attestation_params)
+        end
+
+        it { expect(assigns(:attestation)).to include(attestation_params) }
+        it { expect(assigns(:attestation)[:created_at]).to eq(Time.zone.now) }
+        it { expect(assigns(:attestation)[:logo]).to eq(nil) }
+        it { expect(assigns(:attestation)[:signature]).to eq(nil) }
+        it_behaves_like 'rendering a PDF successfully'
+      end
+    end
+  end
+
+  describe 'GET #edit' do
+    before { get :edit, params: { procedure_id: procedure.id } }
+
+    context 'if an attestation template exists on the procedure' do
+      it { expect(subject.status).to eq(200) }
+      it { expect(assigns(:attestation_template)).to eq(attestation_template) }
+    end
+
+    context 'if an attestation template does not exist on the procedure' do
+      let(:attestation_template) { nil }
+      it { expect(subject.status).to eq(200) }
+      it { expect(assigns(:attestation_template).id).to be_nil }
+      it { expect(assigns(:attestation_template)).to be_an_instance_of(AttestationTemplate) }
+    end
+  end
+
+  describe 'POST #create' do
+    let(:attestation_template) { nil }
+    let(:attestation_params) { { title: 't', body: 'b', footer: 'f', activated: true } }
+
+    context 'nominal' do
+      before do
+        post :create,
+          params: {
+            procedure_id: procedure.id,
+            attestation_template: attestation_params.merge(logo: logo, signature: signature)
+          }
+        procedure.reload
+      end
+
+      it { expect(procedure.attestation_template).to have_attributes(attestation_params) }
+      it { expect(procedure.attestation_template.activated).to be true }
+      it { expect(procedure.attestation_template.logo.download).to eq(logo2.read) }
+      it { expect(procedure.attestation_template.signature.download).to eq(signature2.read) }
+      it { expect(response).to redirect_to edit_admin_procedure_attestation_template_path(procedure) }
+      it { expect(flash.notice).to eq("L'attestation a bien été sauvegardée") }
+
+      after { procedure.attestation_template.destroy }
+    end
+
+    context 'when something wrong happens in the attestation template creation' do
+      let(:invalid_footer) { 'f' * 200 }
+      let(:attestation_params) { { title: 't', body: 'b', footer: invalid_footer, activated: true } }
+
+      before do
+        post :create,
+          params: {
+            procedure_id: procedure.id,
+            attestation_template: attestation_params
+          }
+        procedure.reload
+      end
+
+      it { expect(response).to redirect_to edit_admin_procedure_attestation_template_path(procedure) }
+      it { expect(flash.alert).to be_present }
+      it { expect(procedure.attestation_template).to be nil }
+    end
+  end
+
+  describe 'PATCH #update' do
+    let(:attestation_params) { { title: 't', body: 'b', footer: 'f' } }
+    let(:attestation_params_with_images) { attestation_params.merge(logo: logo, signature: signature) }
+
+    context 'nominal' do
+      before do
+        patch :update,
+          params: {
+            procedure_id: procedure.id,
+            attestation_template: attestation_params_with_images
+          }
+        procedure.reload
+      end
+
+      it { expect(procedure.attestation_template).to have_attributes(attestation_params) }
+      it { expect(procedure.attestation_template.logo.download).to eq(logo2.read) }
+      it { expect(procedure.attestation_template.signature.download).to eq(signature2.read) }
+      it { expect(response).to redirect_to edit_admin_procedure_attestation_template_path(procedure) }
+      it { expect(flash.notice).to eq("L'attestation a bien été modifiée") }
+
+      after { procedure.attestation_template.destroy }
+    end
+
+    context 'when something wrong happens in the attestation template creation' do
+      before do
+        expect_any_instance_of(AttestationTemplate).to receive(:update).and_return(false)
+        expect_any_instance_of(AttestationTemplate).to receive(:errors)
+          .and_return(double(full_messages: ['nop']))
+
+        patch :update,
+          params: {
+            procedure_id: procedure.id,
+            attestation_template: attestation_params_with_images
+          }
+        procedure.reload
+      end
+
+      it { expect(response).to redirect_to edit_admin_procedure_attestation_template_path(procedure) }
+      it { expect(flash.alert).to eq('nop') }
+    end
+  end
+end
diff --git a/spec/views/shared/attachment/_update.html.haml_spec.rb b/spec/views/shared/attachment/_update.html.haml_spec.rb
index 3e94f9e8e..6ec4d7aae 100644
--- a/spec/views/shared/attachment/_update.html.haml_spec.rb
+++ b/spec/views/shared/attachment/_update.html.haml_spec.rb
@@ -19,7 +19,7 @@ describe 'shared/attachment/_update.html.haml', type: :view do
     end
   end
 
-  context 'when there is a attached file' do
+  context 'when there is an attached file' do
     it 'renders a form field for uploading a file' do
       expect(subject).to have_selector('input[type=file]:not(.hidden)')
     end
@@ -28,7 +28,7 @@ describe 'shared/attachment/_update.html.haml', type: :view do
       expect(subject).not_to have_content(attached_file.filename.to_s)
     end
 
-    it 'doesn’t render action buttons' do
+    it 'does not render action buttons' do
       expect(subject).not_to have_link('Remplacer')
       expect(subject).not_to have_link('Supprimer')
     end
@@ -40,23 +40,30 @@ describe 'shared/attachment/_update.html.haml', type: :view do
         expect(subject).to have_content(attached_file.filename.to_s)
       end
 
-      it 'renders action buttons' do
-        expect(subject).to have_button('Remplacer')
-      end
-
       it 'hides the form field by default' do
         expect(subject).to have_selector('input[type=file].hidden')
       end
 
-      it 'hides the Delete button by default' do
-        is_expected.not_to have_link('Supprimer')
-      end
-
-      context 'and the user can delete the attachment' do
-        let(:user_can_destroy) { true }
-
-        it { is_expected.to have_link('Supprimer') }
+      it 'shows the Delete button by default' do
+        is_expected.to have_link('Supprimer')
       end
     end
   end
+
+  context 'when the user cannot destroy the attachment' do
+    subject do
+      form_for(champ.dossier) do |form|
+        render 'shared/attachment/edit', {
+          form: form,
+          attached_file: attached_file,
+          accept: 'image/png',
+          user_can_destroy: user_can_destroy
+        }
+      end
+    end
+
+    it 'hides the Delete button' do
+      is_expected.not_to have_link('Supprimer')
+    end
+  end
 end