diff --git a/mysql-test/include/platform.combinations b/mysql-test/include/platform.combinations
index 4681ac05314..4f0660b7a40 100644
--- a/mysql-test/include/platform.combinations
+++ b/mysql-test/include/platform.combinations
@@ -1,4 +1,6 @@
 [win]
 
+[aix]
+
 [unix]
 
diff --git a/mysql-test/lib/My/Platform.pm b/mysql-test/lib/My/Platform.pm
index db1206f187e..b8bc9f8ec84 100644
--- a/mysql-test/lib/My/Platform.pm
+++ b/mysql-test/lib/My/Platform.pm
@@ -22,7 +22,7 @@ use File::Basename;
 use File::Path;
 
 use base qw(Exporter);
-our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL
+our @EXPORT= qw(IS_CYGWIN IS_WINDOWS IS_WIN32PERL IS_AIX
 		native_path posix_path mixed_path
                 check_socket_path_length process_alive open_for_append);
 
@@ -54,6 +54,15 @@ BEGIN {
   }
 }
 
+BEGIN {
+  if ($^O eq "aix") {
+    eval 'sub IS_AIX { 1 }';
+  }
+  else {
+    eval 'sub IS_AIX { 0 }';
+  }
+}
+
 
 #
 # native_path
diff --git a/mysql-test/main/mysqld--help,aix.rdiff b/mysql-test/main/mysqld--help,aix.rdiff
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 905c3460d46..86f2d6c0c18 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -17,7 +17,13 @@ sub skip_combinations {
                 unless $ENV{DEBUG_KEY_MANAGEMENT_SO};
 
   # don't run tests for the wrong platform
-  $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ];
+  if (IS_WINDOWS) {
+    $skip{'include/platform.combinations'} = [ 'aix', 'unix' ];
+  } elsif (IS_AIX) {
+    $skip{'include/platform.combinations'} = [ 'win', 'unix' ];
+  } else {
+    $skip{'include/platform.combinations'} = [ 'aix', 'win' ];
+  }
 
   $skip{'include/maybe_debug.combinations'} =
     [ defined $::mysqld_variables{'debug-dbug'} ? 'release' : 'debug' ];