diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml
index b60c1f0080ce8c083ec7f36e8aa2afe57297ff96..09e8fde27880ce780a1455e20ce455b8cff94195 100644
--- a/roles/xmpp_server/molecule/default/molecule.yml
+++ b/roles/xmpp_server/molecule/default/molecule.yml
@@ -15,7 +15,7 @@ lint:
 platforms:
 
   - name: ldap-server
-    box: debian/contrib-jessie64
+    box: debian/contrib-stretch64
     memory: 512
     cpus: 1
     interfaces:
@@ -24,19 +24,6 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: client-jessie
-    groups:
-      - clients
-      - 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: client-stretch
     groups:
       - clients
@@ -50,32 +37,6 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-mandatory-jessie64.domain1
-    groups:
-      - parameters-mandatory
-      - jessie
-    box: debian/contrib-jessie64
-    memory: 512
-    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: 512
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.31
-        network_name: private_network
-        type: static
-
   - name: parameters-mandatory-stretch64.domain1
     groups:
       - parameters-mandatory