diff --git a/roles/backup_client/molecule/default/tests/test_parameters_mandatory.py b/roles/backup_client/molecule/default/tests/test_parameters_mandatory.py
index 805a5800f5d855b6b4a0c2ed5946088f671934e7..5f0c0d804629d65f74ea594703df034c816763bd 100644
--- a/roles/backup_client/molecule/default/tests/test_parameters_mandatory.py
+++ b/roles/backup_client/molecule/default/tests/test_parameters_mandatory.py
@@ -64,25 +64,13 @@ def test_duply_configuration_content(host):
 
     with host.sudo():
 
-        ansible_facts = host.ansible("setup")["ansible_facts"]
-
         duply_configuration = host.file('/etc/duply/main/conf')
 
-        if ansible_facts['ansible_distribution_release'] == 'jessie':
-            assert "GPG_KEYS_ENC='1A129C54'" in duply_configuration.content
-            assert "GPG_KEY_SIGN='1A129C54'" in duply_configuration.content
-            assert "TARGET='sftp://bak-parameters-mandatory-j64@10.31.127.10:2222//duplicity'" in duply_configuration.content
-            assert "DUPL_PARAMS=\"$DUPL_PARAMS --ssh-backend pexpect --ssh-options='-oLogLevel=ERROR -oUserKnownHostsFile=/dev/null " \
-                "-oGlobalKnownHostsFile=/etc/duply/main/ssh/known_hosts -oIdentityFile=/etc/duply/main/ssh/identity'\"" in duply_configuration.content
-
-        elif ansible_facts['ansible_distribution_release'] == 'stretch':
-            assert "GPG_KEYS_ENC='59C26F031A129C54'" in duply_configuration.content
-            assert "GPG_KEY_SIGN='59C26F031A129C54'" in duply_configuration.content
-            assert "TARGET='pexpect+sftp://bak-parameters-mandatory-s64@10.31.127.10:2222//duplicity'" in duply_configuration.content
-            assert "DUPL_PARAMS=\"$DUPL_PARAMS --ssh-options='-oLogLevel=ERROR -oUserKnownHostsFile=/dev/null " \
-                "-oGlobalKnownHostsFile=/etc/duply/main/ssh/known_hosts -oIdentityFile=/etc/duply/main/ssh/identity'\"" in duply_configuration.content
-        else:
-            raise Exception("Failed to execute content check for: %s" % ansible_facts['ansible_distribution_release'])
+        assert "GPG_KEYS_ENC='59C26F031A129C54'" in duply_configuration.content
+        assert "GPG_KEY_SIGN='59C26F031A129C54'" in duply_configuration.content
+        assert "TARGET='pexpect+sftp://bak-parameters-mandatory-s64@10.31.127.10:2222//duplicity'" in duply_configuration.content
+        assert "DUPL_PARAMS=\"$DUPL_PARAMS --ssh-options='-oLogLevel=ERROR -oUserKnownHostsFile=/dev/null " \
+            "-oGlobalKnownHostsFile=/etc/duply/main/ssh/known_hosts -oIdentityFile=/etc/duply/main/ssh/identity'\"" in duply_configuration.content
 
 
 def test_duply_gnupg_keyring_private_keys(host):
@@ -92,18 +80,7 @@ def test_duply_gnupg_keyring_private_keys(host):
     """
 
     with host.sudo():
-        ansible_facts = host.ansible("setup")["ansible_facts"]
-
-        if ansible_facts['ansible_distribution_release'] == 'jessie':
-            gpg_binary = 'gpg2'
-            key_offset = 8
-        elif ansible_facts['ansible_distribution_release'] == 'stretch':
-            gpg_binary = 'gpg'
-            key_offset = 8
-        else:
-            raise Exception("Failed to execute check for distribution release: %s" % ansible_facts['ansible_distribution_release'])
-
-        private_key_listing = host.run('%s --homedir /etc/duply/main/gnupg --list-public-keys' % gpg_binary)
+        private_key_listing = host.run('gpg --homedir /etc/duply/main/gnupg --list-public-keys')
 
         assert private_key_listing.rc == 0
-        assert '59C26F031A129C54'[key_offset:] in private_key_listing.stdout
+        assert '59C26F031A129C54' in private_key_listing.stdout