diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 605c4627f920d9e5a0b01fde7bdc321b6675fe61..fa0623bd6e31e11aec7042e4aa1352af2c899da5 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -131,6 +131,7 @@ Distribution compatibility
 Role is compatible with the following distributions:
 
 - Debian 9 (Stretch)
+- Debian 10 (Buster)
 
 
 Examples
diff --git a/roles/preseed/meta/main.yml b/roles/preseed/meta/main.yml
index ca68a72eed04068b99b0a839308eca4860737256..6c1a5eade593086cd3b941b653035fb22e26169b 100644
--- a/roles/preseed/meta/main.yml
+++ b/roles/preseed/meta/main.yml
@@ -8,5 +8,5 @@ galaxy_info:
   platforms:
     - name: Debian
       versions:
-        - 8
         - 9
+        - 10
diff --git a/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml b/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml
index e0b7af44d8dc42809a05be6fa8487ad052c75e7f..f0caf7361921a87ee06b2b878d0ed6c754e21db1 100644
--- a/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml
+++ b/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml
@@ -21,3 +21,21 @@ preseed_server_overrides:
     network_interface: eth1
     root_password: myrootpassword
     timezone: Europe/Belgrade
+  parameters-optional-with-overrides-buster64:
+    country: RS
+    dns: 1.1.1.1
+    domain: example.com
+    gateway: 2.2.2.2
+    hostname: testing
+    ip: 3.3.3.3
+    keymap: sv
+    language: sr
+    locale: en_UK.UTF-8
+    mirror_directory: /
+    mirror_hostname: ftp.de.debian.org
+    mirror_proxy: http://proxy.local
+    netmask: 255.255.0.0
+    network_auto: false
+    network_interface: eth1
+    root_password: myrootpassword
+    timezone: Europe/Belgrade
diff --git a/roles/preseed/molecule/default/molecule.yml b/roles/preseed/molecule/default/molecule.yml
index 9fced0c5c12245f2e6ecdfa2a3b3eba373c1e77c..1a4e6884a6a4c41a7f7f6baccd15b3f3a77312f9 100644
--- a/roles/preseed/molecule/default/molecule.yml
+++ b/roles/preseed/molecule/default/molecule.yml
@@ -35,6 +35,27 @@ platforms:
     memory: 256
     cpus: 1
 
+  - name: parameters-mandatory-buster64
+    groups:
+      - parameters-mandatory
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+
+  - name: parameters-optional-buster64
+    groups:
+      - parameters-optional
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+
+  - name: parameters-optional-with-overrides-buster64
+    groups:
+      - parameters-optional-with-overrides
+    box: debian/contrib-buster64
+    memory: 256
+    cpus: 1
+
 provisioner:
   name: ansible
   config_options:
diff --git a/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py b/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py
index cad2a1456d3504a2bc70236409b51a83844b0de7..f43b05e5d1eaf0c3aabe2c2cf56e39ba1f8a8972 100644
--- a/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py
+++ b/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py
@@ -1,5 +1,7 @@
 import os
 
+import pytest
+
 import testinfra.utils.ansible_runner
 
 
@@ -7,12 +9,16 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('parameters-optional-with-overrides')
 
 
-def test_preseed_configuration_file_content_host_without_overrides(host):
+@pytest.mark.parametrize("distribution_release", [
+    "stretch",
+    "buster"
+])
+def test_preseed_configuration_file_content_host_without_overrides(host, distribution_release):
     """
     Tests content of generated preseed configuration file.
     """
 
-    hostname = 'parameters-mandatory-stretch64'
+    hostname = 'parameters-mandatory-%s64' % distribution_release
 
     with host.sudo():
         preseed_file = host.file(os.path.join("/tmp/preseed_files", "%s.cfg" % hostname))
@@ -39,12 +45,16 @@ d-i netcfg/get_domain string ignored-value""" in preseed_file_content
     assert ssh_public_key in preseed_file_content
 
 
-def test_preseed_configuration_file_content_host_with_overrides(host):
+@pytest.mark.parametrize("distribution_release", [
+    "stretch",
+    "buster"
+])
+def test_preseed_configuration_file_content_host_with_overrides(host, distribution_release):
     """
     Tests content of generated preseed configuration file.
     """
 
-    hostname = 'parameters-optional-with-overrides-stretch64'
+    hostname = 'parameters-optional-with-overrides-%s64' % distribution_release
 
     with host.sudo():
         preseed_file = host.file(os.path.join("/tmp/preseed_files", "%s.cfg" % hostname))