diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 508a6d76c727d8f6ab1449d7638d3ab7aeda2d09..73b63f500c4e1bee51fef7466080603bda6c51c1 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -2042,6 +2042,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 9 (Stretch)
+- Debian 10 (Buster)
 
 
 Examples
diff --git a/roles/database_server/molecule/default/molecule.yml b/roles/database_server/molecule/default/molecule.yml
index a2327d92a997a335064e739a9da105b336c210d5..910d0cc152f3d8f068289a9db0eff72e3aa09a02 100644
--- a/roles/database_server/molecule/default/molecule.yml
+++ b/roles/database_server/molecule/default/molecule.yml
@@ -28,6 +28,20 @@ platforms:
     memory: 512
     cpus: 1
 
+  - name: parameters-mandatory-buster64
+    groups:
+      - parameters-mandatory
+    box: debian/contrib-buster64
+    memory: 512
+    cpus: 1
+
+  - name: deprecated-buster64
+    groups:
+      - deprecated
+    box: debian/contrib-buster64
+    memory: 512
+    cpus: 1
+
 provisioner:
   name: ansible
   config_options:
diff --git a/roles/database_server/molecule/default/prepare.yml b/roles/database_server/molecule/default/prepare.yml
index 7580d991ea2bc20941a54862f99a0c011d0b1fa1..05995313be0d7c6e547c4ddf9aa8c5fba6988c36 100644
--- a/roles/database_server/molecule/default/prepare.yml
+++ b/roles/database_server/molecule/default/prepare.yml
@@ -36,6 +36,14 @@
         state: started
         enabled: true
 
+    - name: Deploy username and password for the root database user
+      copy:
+        src: "deprecated-root-my.cnf"
+        dest: "/root/.my.cnf"
+        owner: root
+        group: root
+        mode: 0400
+
     - name: Set password for the root database user (creating separate entry for different hosts)
       mysql_user:
         check_implicit_admin: true
@@ -48,14 +56,6 @@
         - "::1"
         - "{{ ansible_hostname }}"
 
-    - name: Deploy username and password for the root database user
-      copy:
-        src: "deprecated-root-my.cnf"
-        dest: "/root/.my.cnf"
-        owner: root
-        group: root
-        mode: 0400
-
     - name: Disable use of unix socket login
       command: "mysql -B -e \"update mysql.user set plugin='' where user='root' and plugin='unix_socket'; flush privileges;\""