diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index 2d2f7b3b3f2de17825b13af640f53f8410f1662a..905a75f6e2acc42bf3fd178aeeae1698ae28dfbd 100644
--- a/ansible/roles/mariadb/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -8,6 +8,9 @@ default-character-set=utf8
 default-character-set=utf8
 
 [mysqld]
+{% if kolla_base_distro in ['debian', 'ubuntu'] %}
+basedir=/usr
+{% endif %}
 bind-address={{ api_interface_address }}
 port={{ mariadb_port }}
 
diff --git a/tox.ini b/tox.ini
index bea00e0cf1c7cfefa9869d5da3826a014f059580..472f5d5a5c39d34b354da87687638f942a1eebac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
           OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
           PYTHON OS_TEST_PATH LISTOPT IDOPTION
 commands =
-  find . -type f -name "*.py[c|o]" -delete
+  find . -type f -name "*.py[c|o]" -delete -o -type l -name "*.py[c|o]" -delete
   find . -type d -name "__pycache__" -delete
   stestr run --slowest {posargs}