diff --git a/.travis.yml b/.travis.yml
index 903098f..6d766c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: false
+
 language: perl
 perl:
    - "blead"
@@ -8,7 +10,18 @@ perl:
    - "5.12"
    - "5.10"
    - "5.8"
-   - "5.6"
+
+matrix:
+    include:
+        - addons:
+             mariadb: 5.5
+          perl: 5.20
+        - addons:
+             mariadb: 10.0
+          perl: 5.20
+        - addons:
+             mariadb: 10.1
+          perl: 5.20
 
 before_install:
    - git clone git://github.com/haarg/perl-travis-helper
@@ -20,4 +33,4 @@ install:
    - cpanm --quiet --notest Data::Dumper
 
 script:
-   - mysqltuner
+   - ./mysqltuner.pl
diff --git a/mysqltuner.pl b/mysqltuner.pl
index 72e2764..1a627e0 100755
--- a/mysqltuner.pl
+++ b/mysqltuner.pl
@@ -712,7 +712,7 @@ sub security_recommendations {
 
     # Looking for Empty Password
     @mysqlstatlist = select_array
-"SELECT CONCAT(user, '\@', host) FROM mysql.user WHERE password = '' OR password IS NULL";
+"SELECT CONCAT(user, '\@', host) FROM mysql.user WHERE (password = '' OR password IS NULL) AND (plugin='' OR plugin IS NULL)";
     if (@mysqlstatlist) {
         foreach my $line ( sort @mysqlstatlist ) {
             chomp($line);