diff --git a/roles/preseed/molecule/default/playbook.yml b/roles/preseed/molecule/default/playbook.yml
index daf771c9fa3d333934497134be9c04e90e72141f..2c22a1f59ada6422fcbe90612b0d29a36feb5b39 100644
--- a/roles/preseed/molecule/default/playbook.yml
+++ b/roles/preseed/molecule/default/playbook.yml
@@ -1,53 +1,5 @@
 ---
 
-- hosts: parameters-mandatory
+- hosts: parameters-mandatory,parameters-optional,parameters-optional-with-overrides
   roles:
-    - role: preseed
-
-- hosts: parameters-optional
-  roles:
-    - role: preseed
-      ansible_key: CUSTOMKEY
-      preseed_country: RS
-      preseed_directory: /tmp/custom_preseed_files_location
-      preseed_dns: 1.1.1.1
-      preseed_domain: example.com
-      preseed_gateway: 2.2.2.2
-      preseed_hostname: testing
-      preseed_ip: 3.3.3.3
-      preseed_keymap: sv
-      preseed_language: sr
-      preseed_locale: en_UK.UTF-8
-      preseed_mirror_directory: /
-      preseed_mirror_hostname: ftp.de.debian.org
-      preseed_mirror_proxy: http://proxy.local
-      preseed_netmask: 255.255.0.0
-      preseed_network_auto: no
-      preseed_network_interface: eth1
-      preseed_root_password: myrootpassword
-      preseed_timezone: Europe/Belgrade
-
-- hosts: parameters-optional-with-overrides
-  roles:
-    - role: preseed
-      preseed_directory: /tmp/custom_preseed_files_location
-      ansible_key: CUSTOMKEY
-      preseed_server_overrides:
-        parameters-optional-with-overrides-jessie64:
-          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: no
-          network_interface: eth1
-          root_password: myrootpassword
-          timezone: Europe/Belgrade
+    - preseed