diff --git a/bindep.txt b/bindep.txt
index efa6c067b1..f8ffed149b 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -12,11 +12,13 @@ libsqlite3-dev [platform:dpkg]
 libssl-dev [platform:dpkg]
 libxml2-dev [platform:dpkg]
 libxslt1-dev [platform:dpkg]
-mysql-client [platform:dpkg]
-mysql-server [platform:dpkg]
+mysql-client [platform:dpkg !platform:debian]
+mariadb-client [platform:debian]
+mysql-server [platform:dpkg !platform:debian]
+mariadb-server [platform:debian]
 postgresql-client [platform:dpkg]
 postgresql-server-dev-all [platform:dpkg]
-python-all-dev [platform:dpkg]
+python-all-dev [platform:dpkg !platform:debian]
 python3-all-dev [platform:dpkg]
 
 cyrus-sasl-devel [platform:rpm]
diff --git a/keystone/tests/unit/test_v3_federation.py b/keystone/tests/unit/test_v3_federation.py
index 4f09ea9d50..acf934c866 100644
--- a/keystone/tests/unit/test_v3_federation.py
+++ b/keystone/tests/unit/test_v3_federation.py
@@ -4367,7 +4367,7 @@ class SAMLGenerationTests(test_v3.RestfulTestCase):
                           self.signed_assertion)
         expected_log = (
             'Error when signing assertion, reason: %s\n' % exception_msg)
-        self.assertEqual(expected_log, logger_fixture.output)
+        self.assertIn(expected_log, logger_fixture.output)
 
     def test_sign_assertion_logs_message_if_xmlsec1_is_not_installed(self):
         with mock.patch.object(subprocess, 'check_output') as co_mock:
@@ -4383,7 +4383,7 @@ class SAMLGenerationTests(test_v3.RestfulTestCase):
 
             expected_log = ('Unable to locate xmlsec1 binary on the system. '
                             'Check to make sure it is installed.\n')
-            self.assertEqual(expected_log, logger_fixture.output)
+            self.assertIn(expected_log, logger_fixture.output)
 
 
 class IdPMetadataGenerationTests(test_v3.RestfulTestCase):