diff --git a/spec/features/new_user/dossier_creation_spec.rb b/spec/features/new_user/dossier_creation_spec.rb
index adc24535f..7b94d9696 100644
--- a/spec/features/new_user/dossier_creation_spec.rb
+++ b/spec/features/new_user/dossier_creation_spec.rb
@@ -1,89 +1,94 @@
 require 'spec_helper'
 
-feature 'As a User I wanna create a dossier' do
+feature 'Creating a new dossier:' do
   let(:user)  { create(:user) }
   let(:siret) { '40307130100044' }
   let(:siren) { siret[0...9] }
 
-  context 'Right after sign_in I shall see inscription by credentials/siret, I can create a new Dossier' do
-    let(:procedure_with_siret)     { create(:procedure, :published, :with_api_carto, :with_type_de_champ, :with_two_type_de_piece_justificative) }
-    let(:procedure_for_individual) { create(:procedure, :published, :for_individual, :with_api_carto, :with_type_de_champ, :with_two_type_de_piece_justificative, ask_birthday: ask_birthday) }
+  context 'when the user is already signed in' do
+    before do
+      login_as user, scope: :user
+    end
+
+    context 'when the procedure has identification by individual' do
+      let(:procedure) { create(:procedure, :published, :for_individual, :with_api_carto, :with_type_de_champ, :with_two_type_de_piece_justificative, ask_birthday: ask_birthday) }
+      let(:ask_birthday) { false }
+      let(:expected_birthday) { nil }
 
-    context 'Identification for individual' do
       before do
-        login_as user, scope: :user
-        visit commencer_path(procedure_path: procedure_for_individual.path)
-        fill_in 'individual_nom',       with: 'Nom'
-        fill_in 'individual_prenom',    with: 'Prenom'
+        visit commencer_path(procedure_path: procedure.path)
+        fill_in 'individual_nom',    with: 'Nom'
+        fill_in 'individual_prenom', with: 'Prenom'
       end
 
-      context "when birthday is asked" do
+      shared_examples 'the user can create a new draft' do
+        it do
+          click_button('Continuer')
+
+          expect(page).to have_current_path(users_dossier_carte_path(procedure.dossiers.last.id))
+          click_button('Etape suivante')
+
+          expect(page).to have_current_path(brouillon_dossier_path(procedure.dossiers.last))
+
+          expect(user.dossiers.first.individual.birthdate).to eq(expected_birthday)
+        end
+      end
+
+      context 'when the birthday is asked' do
         let(:ask_birthday) { true }
+        let(:expected_birthday) { Date.new(1987, 10, 14) }
 
-        scenario "with a proper date input field for birthdate (type='date' supported)" do
-          fill_in 'individual_birthdate', with: '1987-10-14'
-          click_button('Continuer')
-
-          expect(page).to have_current_path(users_dossier_carte_path(procedure_for_individual.dossiers.last.id))
-          click_button('Etape suivante')
-
-          expect(page).to have_current_path(brouillon_dossier_path(procedure_for_individual.dossiers.last))
-
-          expect(user.dossiers.first.individual.birthdate).to eq(Date.new(1987, 10, 14))
+        before do
+          fill_in 'individual_birthdate', with: birthday_format
         end
 
-        scenario "with a basic text input field for birthdate (type='date' unsupported)" do
-          fill_in 'individual_birthdate', with: '14/10/1987'
-          click_button('Continuer')
+        context 'when the browser supports `type=date` input fields' do
+          let(:birthday_format) { '1987-10-14' }
+          it_behaves_like 'the user can create a new draft'
+        end
 
-          expect(page).to have_current_path(users_dossier_carte_path(procedure_for_individual.dossiers.last.id.to_s))
-          click_button('Etape suivante')
-
-          expect(page).to have_current_path(brouillon_dossier_path(procedure_for_individual.dossiers.last))
-
-          expect(user.dossiers.first.individual.birthdate).to eq(Date.new(1987, 10, 14))
+        context 'when the browser does not support `type=date` input fields' do
+          let(:birthday_format) { '1987-10-14' }
+          it_behaves_like 'the user can create a new draft'
         end
       end
 
-      context "when birthday is not asked" do
+      context 'when the birthday is not asked' do
         let(:ask_birthday) { false }
-
-        scenario "no need for birthday" do
-          click_button('Continuer')
-
-          expect(page).to have_current_path(users_dossier_carte_path(procedure_for_individual.dossiers.last))
-          click_button('Etape suivante')
-
-          expect(page).to have_current_path(brouillon_dossier_path(procedure_for_individual.dossiers.last))
-
-          expect(user.dossiers.first.individual.birthdate).to eq(nil)
-        end
+        let(:expected_birthday) { nil }
+        it_behaves_like 'the user can create a new draft'
       end
     end
 
-    scenario 'Identification through siret', vcr: { cassette_name: 'api_adresse_search_paris_3' }, js: true do
-      login_as user, scope: :user
-      visit commencer_path(procedure_path: procedure_with_siret.path)
-      expect(page).to have_current_path(users_dossier_path(procedure_with_siret.dossiers.last.id.to_s))
+    context 'when identifying through SIRET' do
+      let(:procedure) { create(:procedure, :published, :with_api_carto, :with_type_de_champ, :with_two_type_de_piece_justificative) }
 
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
-        .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=/)
-        .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/#{siret}?.*token=/)
-        .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/exercices.json'))
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/#{siret}?.*token=/)
-        .to_return(status: 404, body: '')
+      before do
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+          .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=/)
+          .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/#{siret}?.*token=/)
+          .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/exercices.json'))
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/#{siret}?.*token=/)
+          .to_return(status: 404, body: '')
+      end
 
-      page.find_by_id('dossier-siret').set siret
-      click_on 'Valider'
-      wait_for_ajax
+      scenario 'the user can enter the SIRET of its etablissement and create a new draft', vcr: { cassette_name: 'api_adresse_search_paris_3' }, js: true do
+        visit commencer_path(procedure_path: procedure.path)
+        dossier = procedure.dossiers.last
+        expect(page).to have_current_path(siret_dossier_path(dossier))
 
-      expect(page).to have_css('#recap-info-entreprise')
-      click_on 'Etape suivante'
-      expect(page).to have_current_path(users_dossier_carte_path(procedure_with_siret.dossiers.last.id.to_s))
-      click_on 'Etape suivante'
-      expect(page).to have_current_path(brouillon_dossier_path(procedure_with_siret.dossiers.last))
+        page.find_by_id('dossier-siret').set siret
+        click_on 'Valider'
+        wait_for_ajax
+
+        expect(page).to have_css('#recap-info-entreprise')
+        click_on 'Etape suivante'
+        expect(page).to have_current_path(users_dossier_carte_path(procedure.dossiers.last.id.to_s))
+        click_on 'Etape suivante'
+        expect(page).to have_current_path(brouillon_dossier_path(procedure.dossiers.last))
+      end
     end
   end
 end