diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml
index d1aecfd9650a08002379b31e87e4dad4275ebd03..04b21eb3ae05ef0e77e5b26660d13318a9e8ce79 100644
--- a/roles/mail_forwarder/molecule/default/molecule.yml
+++ b/roles/mail_forwarder/molecule/default/molecule.yml
@@ -17,7 +17,7 @@ platforms:
   - name: mail-server
     groups:
       - mail-servers
-    box: debian/contrib-jessie64
+    box: debian/contrib-stretch64
     memory: 256
     cpus: 1
     interfaces:
@@ -29,7 +29,7 @@ platforms:
   - name: client1
     groups:
       - clients
-    box: debian/contrib-jessie64
+    box: debian/contrib-stretch64
     memory: 256
     cpus: 1
     interfaces:
@@ -38,42 +38,6 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-mandatory-jessie64
-    groups:
-      - parameters-mandatory
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.20
-        network_name: private_network
-        type: static
-
-  - name: parameters-optional-jessie64
-    groups:
-      - parameters-optional
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.21
-        network_name: private_network
-        type: static
-
-  - name: parameters-no-incoming-jessie64
-    groups:
-      - parameters-no-incoming
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.22
-        network_name: private_network
-        type: static
-
   - name: parameters-mandatory-stretch64
     groups:
       - parameters-mandatory