diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 10dd56c38..8cea46964 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -204,11 +204,18 @@ export default {
     },
     clientCreditInsurance: {
         addNewContract: 'vn-client-credit-insurance-index vn-float-button[ui-sref="client.card.creditInsurance.create"]',
-        newCredit: 'vn-client-credit-insurance-create vn-input-number[ng-model="$ctrl.creditClassification.credit"]',
-        newGrade: 'vn-client-credit-insurance-create vn-input-number[ng-model="$ctrl.creditClassification.grade"]',
-        newStartingDate: 'vn-client-credit-insurance-create vn-date-picker[ng-model="$ctrl.creditClassification.started"]',
+        newCreditClassification: 'vn-client-credit-insurance-create vn-input-number[ng-model="$ctrl.creditClassification.credit"]',
+        newInsuranceCredit: 'vn-client-credit-insurance-insurance-create vn-input-number[ng-model="$ctrl.insurance.credit"]',
+        newClassificationGrade: 'vn-client-credit-insurance-create vn-input-number[ng-model="$ctrl.creditClassification.grade"]',
+        newInsuranceGrade: 'vn-client-credit-insurance-insurance-create vn-input-number[ng-model="$ctrl.insurance.grade"]',
+        newClassificationStartingDate: 'vn-client-credit-insurance-create vn-date-picker[ng-model="$ctrl.creditClassification.started"]',
+        newInsuranceStartingDate: 'vn-client-credit-insurance-insurance-create vn-date-picker[ng-model="$ctrl.insurance.created"]',
         endCurrentContract: 'vn-client-credit-insurance-index vn-icon-button[icon="lock"]',
-        saveNewContract: 'vn-client-credit-insurance-create vn-submit'
+        firstContratViewCreditButton: 'vn-client-credit-insurance-index vn-card > vn-horizontal:nth-child(1) vn-icon-button[icon="desktop_windows"]',
+        addNewCredit: 'vn-client-credit-insurance-insurance-index vn-float-button vn-icon[icon="add"]',
+        saveNewContract: 'vn-client-credit-insurance-create vn-submit',
+        saveNewInsuranceCredit: 'vn-client-credit-insurance-insurance-create button[type="submit"]',
+        anyCreditInsuranceLine: 'vn-client-credit-insurance-insurance-index vn-tbody > vn-tr',
     },
     clientContacts: {
         addContactButton: 'vn-client-contact vn-icon[icon="add_circle"]',
diff --git a/e2e/paths/02-client/20_credit_insurance.spec.js b/e2e/paths/02-client/20_credit_insurance.spec.js
index 5ae56d52f..278eb861a 100644
--- a/e2e/paths/02-client/20_credit_insurance.spec.js
+++ b/e2e/paths/02-client/20_credit_insurance.spec.js
@@ -25,9 +25,9 @@ describe('Client credit insurance path', () => {
     });
 
     it('should create a new credit contract', async() => {
-        await page.write(selectors.clientCreditInsurance.newCredit, '1000');
-        await page.write(selectors.clientCreditInsurance.newGrade, '1');
-        await page.pickDate(selectors.clientCreditInsurance.newStartingDate, previousMonth);
+        await page.write(selectors.clientCreditInsurance.newCreditClassification, '1000');
+        await page.write(selectors.clientCreditInsurance.newClassificationGrade, '1');
+        await page.pickDate(selectors.clientCreditInsurance.newClassificationStartingDate, previousMonth);
         await page.waitToClick(selectors.clientCreditInsurance.saveNewContract);
         await page.waitForState('client.card.creditInsurance.index');
     });
@@ -36,7 +36,46 @@ describe('Client credit insurance path', () => {
         await page.waitForSelector(selectors.clientCreditInsurance.addNewContract, {hidden: true});
     });
 
-    it(`should bring the current contract to an end`, async() => {
+    it(`should click the view credits button`, async() => {
+        await page.waitToClick(selectors.clientCreditInsurance.firstContratViewCreditButton);
+        await page.waitForState('client.card.creditInsurance.insurance.index');
+    });
+
+    it('should click the add new credit button which opens the new credit form', async() => {
+        await page.waitToClick(selectors.clientCreditInsurance.addNewCredit);
+        await page.waitForState('client.card.creditInsurance.insurance.create');
+    });
+
+    it('should fill the form but provide no grade to the new credit hence fail', async() => {
+        await page.write(selectors.clientCreditInsurance.newInsuranceCredit, '2000');
+        await page.pickDate(selectors.clientCreditInsurance.newInsuranceStartingDate, previousMonth);
+        await page.waitToClick(selectors.clientCreditInsurance.saveNewInsuranceCredit);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toEqual('The grade must be similar to the last one');
+    });
+
+    it('should provide a correct grade and succesfully save a new credit then be redirected to the credit index', async() => {
+        await page.write(selectors.clientCreditInsurance.newInsuranceGrade, '999');
+        await page.waitToClick(selectors.clientCreditInsurance.saveNewInsuranceCredit);
+        const message = await page.waitForSnackbar();
+        await page.waitForState('client.card.creditInsurance.insurance.index');
+
+        expect(message.text).toEqual('Data saved!');
+    });
+
+    it('should check the amount of credits is the expected', async() => {
+        const result = await page.countElement(selectors.clientCreditInsurance.anyCreditInsuranceLine);
+
+        expect(result).toEqual(2);
+    });
+
+    it('should navigate to the credit insurance section', async() => {
+        await page.waitToClick(`vn-left-menu li > a[ui-sref="client.card.creditInsurance.index"]`);
+        await page.waitForState('client.card.creditInsurance.index');
+    });
+
+    it('should bring the current contract to an end', async() => {
         await page.waitToClick(selectors.clientCreditInsurance.endCurrentContract);
         await page.waitToClick(selectors.globalItems.acceptButton);
     });