diff --git a/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js
index e253a156e..20c032bd9 100755
--- a/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js
+++ b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js
@@ -74,8 +74,10 @@ it('C339305: 01 Connecting test API successsfully', () => {
 it('C339338: 02 Enabling Mollie carriers in Prestashop successfully', () => {
       cy.visit('/admin1/')
       cy.get('[id="subtab-AdminPaymentPreferences"]').find('[href]').eq(0).click({force:true})
-      cy.get('[class="js-multiple-choice-table-select-column"]').eq(6).click()
-      cy.get('[class="btn btn-primary"]').eq(3).click()
+      cy.get('[class="js-multiple-choice-table-select-column"]').each(($element) => { // checks all the checkboxes in the loop, if not checked
+        cy.wrap($element).click()
+      })
+      cy.get('[id="form-carrier-restrictions-save-button"]').click()
 })
 it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end components, Saving the form, checking if there are no Errors in Console', () => {
       cy.visit('/admin1/')
@@ -108,6 +110,7 @@ it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end comp
       cy.get('[name="MOLLIE_DISPLAY_ERRORS"]').should('exist')
       cy.get('[name="MOLLIE_DEBUG_LOG"]').should('exist')
       cy.get('[name="MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID"]').should('be.visible') // checking the Subscriptions carriers select
+      cy.get('[name="MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID"]').select('Click and collect')
       cy.get('#module_form_submit_btn').click({force:true}) //checking the saving
       cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert
       //cy.window() will check if there are no Errors in console
diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js
index 76fd396a2..b04ed7571 100755
--- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js
+++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js
@@ -43,8 +43,10 @@ it('C339305: Connecting test API successsfully', () => {
 it('C339338: Enabling Mollie carriers in Prestashop successfully', () => {
       cy.visit('/admin1/')
       cy.get('[id="subtab-AdminPaymentPreferences"]').find('[href]').eq(0).click({force:true})
-      cy.get('[class="js-multiple-choice-table-select-column"]').eq(6).click()
-      cy.get('[class="btn btn-primary"]').eq(3).click()
+      cy.get('[class="js-multiple-choice-table-select-column"]').each(($element) => { // checks all the checkboxes in the loop, if not checked
+        cy.wrap($element).click()
+      })
+      cy.get('[id="form-carrier-restrictions-save-button"]').click()
 })
 it('C339339: Checking the Advanced Settings tab, verifying the Front-end components, Saving the form, checking if there are no Errors in Console', () => {
       cy.visit('/admin1/')
@@ -78,6 +80,7 @@ it('C339339: Checking the Advanced Settings tab, verifying the Front-end compone
       cy.get('[name="MOLLIE_DISPLAY_ERRORS"]').should('exist')
       cy.get('[name="MOLLIE_DEBUG_LOG"]').should('exist')
       cy.get('[name="MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID"]').should('be.visible') // checking the Subscriptions carriers select
+      cy.get('[name="MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID"]').select('Click and collect')
       cy.get('#module_form_submit_btn').click({force:true}) //checking the saving
       cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert
       //cy.window() will check if there are no Errors in console
diff --git a/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js
index c570728c9..20bf307c2 100755
--- a/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js
+++ b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js
@@ -35,12 +35,14 @@ it('C176305: Check if Subscription options added in Product BO', () => {
   cy.contains('Product with combinations').click()
   cy.get('[id="tab_step3"]').click()
   cy.contains('Daily').click({force:true})
+  cy.contains('None').click({force:true})
   cy.get('[class="token"]').should('be.visible')
   cy.get('#create-combinations').click()
   cy.wait(5000)
   cy.reload()
   cy.wait(5000)
   cy.contains('Mollie Subscription - Daily').should('be.visible')
+  cy.contains('Mollie Subscription - None').should('be.visible')
   cy.get('[class="attribute-quantity"]').last().find('[type="text"]').clear().type('999')
   cy.get('#submit').click()
   cy.get('.growl-message').contains('Settings updated.')