diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index d726766d015ae8f0facdf7e8ca0907837541de8d..053fd79e9b723dea185e63b175b3d2059327b424 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -2020,6 +2020,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 8 (Jessie)
+- Debian 9 (Stretch)
 
 
 Examples
diff --git a/roles/database/molecule/default/molecule.yml b/roles/database/molecule/default/molecule.yml
index c8347df4ce0e9492868b591c3abbf6fd980decfd..a926b4433a53ddb94a23f0258ea410c9f82c18a5 100644
--- a/roles/database/molecule/default/molecule.yml
+++ b/roles/database/molecule/default/molecule.yml
@@ -29,6 +29,22 @@ platforms:
     memory: 512
     cpus: 1
 
+  - name: parameters-mandatory-stretch64
+    groups:
+      - parameters-mandatory
+    box: debian/contrib-stretch64
+    memory: 256
+    cpus: 1
+
+  - name: parameters-optional-stretch64
+    groups:
+      - parameters-optional
+      - backup-server
+    box: debian/contrib-stretch64
+    memory: 512
+    cpus: 1
+
+
 provisioner:
   name: ansible
   config_options: