diff --git a/roles/backup/molecule/default/playbook.yml b/roles/backup/molecule/default/playbook.yml
index 526735e77492a7ce5b54735a8725b0806b5c274d..ed8fe429883e872585a74322f8a021a03d24487f 100644
--- a/roles/backup/molecule/default/playbook.yml
+++ b/roles/backup/molecule/default/playbook.yml
@@ -1,38 +1,6 @@
 ---
 
-- hosts: parameters-mandatory
-  become: yes
+- hosts: parameters-mandatory,parameters-optional
+  become: true
   roles:
-    - role: backup
-      backup_patterns_filename: "test"
-  vars:
-    # Required for backup_client role which is part of meta dependencies.
-    backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-mandatory.asc') }}"
-    backup_server: 10.31.127.10
-    backup_server_host_ssh_public_keys:
-      - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
-      - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
-      - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
-      - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
-    backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}"
-
-
-- hosts: parameters-optional
-  become: yes
-  roles:
-    - role: backup
-      backup_patterns_filename: "test"
-      backup_patterns:
-        - /etc/hosts
-        - /etc/ethers
-        - /var/log
-  vars:
-    # Required for backup_client role which is part of meta dependencies.
-    backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}"
-    backup_server: 10.31.127.10
-    backup_server_host_ssh_public_keys:
-      - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
-      - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
-      - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
-      - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
-    backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}"
+    - backup