diff --git a/CI/ci-linux.sh b/CI/ci-linux.sh
index 8110e3f6..78ac236e 100755
--- a/CI/ci-linux.sh
+++ b/CI/ci-linux.sh
@@ -33,6 +33,7 @@ fi
 #=====================================
 NC='\033[0m'
 OUTPUT='\033[0;32m'
+WARNING='\033[0;93m'
 
 
 echo -e "${OUTPUT}"
@@ -97,13 +98,22 @@ echo "Running Python unittests Release version "
 echo "======================================================================"
 echo -e "${NC}"
 
+if [ "$LANGUAGE" == "C++11"  ] || [ "$COMPILER" == "gcc" ] ; then
 
-# Execute Python unittests
-cd Python-Unittests
+  # Execute Python unittests
+  cd Python-Unittests
+
+  python -m unittest discover -v
+
+  cd ..
+
+else
+  echo -e "${WARNING}"
+  echo "WARNING! Python unittests disabled !!"
+  echo -e "${NC}"
+fi
 
-python -m unittest discover -v
 
-cd ..
 cd ..
 
 
@@ -171,8 +181,16 @@ echo "Running Python unittests Debug version "
 echo "======================================================================"
 echo -e "${NC}"
 
+if [ "$LANGUAGE" == "C++11"  ] || [ "$COMPILER" == "gcc" ] ; then
 
-# Execute Python unittests
-cd Python-Unittests
+  # Execute Python unittests
+  cd Python-Unittests
 
-python -m unittest discover -v
+  python -m unittest discover -v
+else
+
+  echo -e "${WARNING}"
+  echo "WARNING! Python unittests disabled !!"
+  echo -e "${NC}"
+
+fi
diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh
index ba93f797..b580c59f 100755
--- a/CI/ci-mac.sh
+++ b/CI/ci-mac.sh
@@ -25,6 +25,7 @@ fi
 #=====================================
 NC='\033[0m'
 OUTPUT='\033[0;32m'
+WARNING='\033[0;93m'
 
 
 echo -e "${OUTPUT}"
@@ -102,7 +103,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
   cd ..
 
 else
+  echo -e "${WARNING}"
   echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!"
+  echo -e "${NC}"
 fi
 
 
@@ -182,5 +185,9 @@ if [ "$LANGUAGE" == "C++11" ]; then
   cp ../Build/python/openmesh.so .
   python -m unittest discover -v
 else
+
+  echo -e "${WARNING}"
   echo "WARNING! Python unittests disabled for clang on Mac with c++98 !!"
+  echo -e "${NC}"
+
 fi