diff --git a/roles/backup_client/molecule/default/tests/test_parameters_optional.py b/roles/backup_client/molecule/default/tests/test_parameters_optional.py
index b9ec176e5e78bff814796eabaaccdb68983c6203..ff1f54f7418d5faa66a02eb48894ff5a0c59965e 100644
--- a/roles/backup_client/molecule/default/tests/test_parameters_optional.py
+++ b/roles/backup_client/molecule/default/tests/test_parameters_optional.py
@@ -63,24 +63,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 "TARGET='sftp://backupuser@10.31.127.10:3333//duplicity/parameters-optional-j64'" 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
-            assert "GPG_KEYS_ENC='7A4F400A,C3A9444B,28063B3F,71223B72'" in duply_configuration.content
-            assert "GPG_KEY_SIGN='7A4F400A'" in duply_configuration.content
-        elif ansible_facts['ansible_distribution_release'] == 'stretch':
-            assert "GPG_KEYS_ENC='C4B2AE9F7A4F400A,3093C91BC3A9444B,86816FD928063B3F,8A14CD6C71223B72'" in duply_configuration.content
-            assert "GPG_KEY_SIGN='C4B2AE9F7A4F400A'" in duply_configuration.content
-            assert "TARGET='pexpect+sftp://backupuser@10.31.127.10:3333//duplicity/parameters-optional-s64'" 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 check for distribution release: %s" % ansible_facts['ansible_distribution_release'])
+        assert "GPG_KEYS_ENC='C4B2AE9F7A4F400A,3093C91BC3A9444B,86816FD928063B3F,8A14CD6C71223B72'" in duply_configuration.content
+        assert "GPG_KEY_SIGN='C4B2AE9F7A4F400A'" in duply_configuration.content
+        assert "TARGET='pexpect+sftp://backupuser@10.31.127.10:3333//duplicity/parameters-optional-s64'" 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):
@@ -90,21 +79,11 @@ 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 'C4B2AE9F7A4F400A'[key_offset:] in private_key_listing.stdout
+        assert 'C4B2AE9F7A4F400A' in private_key_listing.stdout
 
 
 def test_duply_gnupg_keyring_public_keys(host):
@@ -114,22 +93,11 @@ def test_duply_gnupg_keyring_public_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'])
-
-        public_key_listing = host.run('%s --homedir /etc/duply/main/gnupg --list-public-keys' % gpg_binary)
+        public_key_listing = host.run('gpg --homedir /etc/duply/main/gnupg --list-public-keys')
 
         keys = ['3093C91BC3A9444B', '86816FD928063B3F', '8A14CD6C71223B72']
 
         assert public_key_listing.rc == 0
 
         for key in keys:
-            assert key[key_offset:] in public_key_listing.stdout
+            assert key in public_key_listing.stdout