diff --git a/roles/mail_server/molecule/default/molecule.yml b/roles/mail_server/molecule/default/molecule.yml
index 78a9d16e56bb14c21f86eec41543d0d29943929b..4b60e8971c08fe43fe887ee189818cf620efd23c 100644
--- a/roles/mail_server/molecule/default/molecule.yml
+++ b/roles/mail_server/molecule/default/molecule.yml
@@ -15,7 +15,7 @@ lint:
 platforms:
 
   - name: ldap-server
-    box: debian/contrib-jessie64
+    box: debian/contrib-stretch64
     memory: 256
     cpus: 1
     interfaces:
@@ -24,34 +24,6 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: client1-jessie
-    groups:
-      - client
-      - client-relay-allowed
-      - jessie
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.20
-        network_name: private_network
-        type: static
-
-  - name: client2-jessie
-    groups:
-      - client
-      - client-relay-forbidden
-      - jessie
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.21
-        network_name: private_network
-        type: static
-
   - name: client1-stretch
     groups:
       - client
@@ -80,32 +52,6 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-mandatory-jessie64
-    groups:
-      - parameters-mandatory
-      - jessie
-    box: debian/contrib-jessie64
-    memory: 1024
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.30
-        network_name: private_network
-        type: static
-
-  - name: parameters-optional-jessie64
-    groups:
-      - parameters-optional
-      - jessie
-    box: debian/contrib-jessie64
-    memory: 1024
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.31
-        network_name: private_network
-        type: static
-
   - name: parameters-mandatory-stretch64
     groups:
       - parameters-mandatory