diff --git a/tests/p_python/0-install-python.sh b/tests/p_python/0-install-python.sh
index d102bb6..3ba2adc 100755
--- a/tests/p_python/0-install-python.sh
+++ b/tests/p_python/0-install-python.sh
@@ -4,4 +4,8 @@
 # Install python
 t_Log "Running $0 - installing python."
 
+if [ "$centos_ver" -ge 8 ] ; then
+t_InstallPackage python36
+else
 t_InstallPackage python
+fi
diff --git a/tests/p_python/10-test_python.sh b/tests/p_python/10-test_python.sh
index 52f27ef..57fec65 100755
--- a/tests/p_python/10-test_python.sh
+++ b/tests/p_python/10-test_python.sh
@@ -4,15 +4,21 @@
 
 t_Log "Running $0 - python can print Hello World"
 
+if [ "$centos_ver" -ge 8 ] ; then
+PYTHON=python3
+else
+PYTHON=python
+fi
+
 # creating source file
 FILE='/var/tmp/python-test.py'
 
 cat > $FILE <<EOF
-print "hello centos"
+print ("hello centos")
 EOF
 
 # Executing python
-python $FILE | grep -q "hello centos"
+$PYTHON $FILE | grep -q "hello centos"
 
 t_CheckExitStatus $?
 
diff --git a/tests/p_python/20-python-mysql-test.sh b/tests/p_python/20-python-mysql-test.sh
index 4ba598d..0d26209 100755
--- a/tests/p_python/20-python-mysql-test.sh
+++ b/tests/p_python/20-python-mysql-test.sh
@@ -4,10 +4,15 @@
 
 t_Log "Running $0 - python can retrieve mysql-server version information."
 
+if [ "$centos_ver" -ge 8 ] ; then
+PYTHON=python3
+else
+PYTHON=python
+fi
 # we need a working and running mysql server
 # starting with 5.10, we have to differ between mysql55 and mysql
 
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" -ge 7 ] ; then
   my_packages="mariadb mariadb-server nc"
   mysql_service="mariadb"
 elif [ "$centos_ver" = "5" ] ;then
@@ -21,28 +26,34 @@ fi
 t_ServiceControl ${mysql_service} start >/dev/null 2>&1
 
 # Installing additional python/mysql module
+if [ "$centos_ver" -ge 8 ] ; then
+t_InstallPackage python3-PyMySQL
+importcomponent="pymysql"
+else
 t_InstallPackage MySQL-python
+importcomponent="MySQLdb"
+fi
 
 # create python Scrip
 SCRIPT='/var/tmp/test.py'
 
 cat >$SCRIPT <<EOF
-import MySQLdb
+import $importcomponent
 
-conn = MySQLdb.connect (host = "localhost",
+conn = $importcomponent.connect (host = "localhost",
                            user = "",
                            passwd = "",
-                           db = "test")
+                           db = "")
 cursor = conn.cursor ()
 cursor.execute ("SELECT VERSION()")
 row = cursor.fetchone ()
-print "server version:", row[0]
+print ("server version:", row[0])
 cursor.close ()
 conn.close ()
 EOF
 
 # If we execute the script and get the version it works
-python $SCRIPT |grep -q 'server version'
+$PYTHON $SCRIPT |grep -q 'server version'
 
 t_CheckExitStatus $?