diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml
index fd71133..c30bd6f 100644
--- a/mysql/osfamilymap.yaml
+++ b/mysql/osfamilymap.yaml
@@ -39,7 +39,7 @@ Debian:
 RedHat:
   service: mysqld
   clientpkg: mysql
-  pythonpkg: MySQL-python
+  pythonpkg: python3-PyMySQL
   config:
     file: /etc/my.cnf
     sections:
diff --git a/mysql/osfingermap.yaml b/mysql/osfingermap.yaml
index 9d98126..e2a92a1 100644
--- a/mysql/osfingermap.yaml
+++ b/mysql/osfingermap.yaml
@@ -42,8 +42,11 @@ Ubuntu-16.04:
   # devpkg: libmariadbclient-dev
 
 # Redhat
+Red Hat Enterprise Linux Server-6:
+  pythonpkg: MySQL-python
 Redhat-7:
   # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
+  pythonpkg: MySQL-python
   serverpkg: mariadb-server
   service: mariadb
   clientpkg: mariadb
@@ -53,9 +56,13 @@ Redhat-7:
       mysqld_safe:
         log_error: /var/log/mariadb/mysqld.log
         pid_file: /var/run/mariadb/mysqld.pid
+
 # CentOS
+CentOS-6:
+  pythonpkg: MySQL-python
 CentOS Linux-7:
   # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
+  pythonpkg: MySQL-python
   serverpkg: mariadb-server
   service: mariadb
   clientpkg: mariadb
@@ -71,6 +78,5 @@ CentOS Linux-7:
         log_error: /var/log/mariadb/mysqld.log
         pid_file: /var/run/mariadb/mysqld.pid
 
-# Suse
-Leap-42:
-  pythonpkg: python-PyMySQL
+CentOS Linux-8:
+  pythonpkg: python3-PyMySQL
diff --git a/mysql/remove_test_database.sls b/mysql/remove_test_database.sls
index 1286558..8c9f219 100644
--- a/mysql/remove_test_database.sls
+++ b/mysql/remove_test_database.sls
@@ -6,6 +6,7 @@
 
 include:
   - .python
+  - .server
 
 mysql remove test database:
   mysql_database.absent:
@@ -17,3 +18,5 @@ mysql remove test database:
     - connection_pass: '{{ mysql_salt_pass }}'
     {%- endif %}
     - connection_charset: utf8
+    - require:
+      - service: mysqld-service-running