diff --git a/mysql-test/include/not_aix.inc b/mysql-test/include/not_aix.inc
new file mode 100644
index 00000000000..ecdb3b97a6e
--- /dev/null
+++ b/mysql-test/include/not_aix.inc
@@ -0,0 +1,4 @@
+#
+# suite.pm will make sure that all tests including this file
+# will be skipped if run under AIX
+#
diff --git a/mysql-test/main/mdev-21101.test b/mysql-test/main/mdev-21101.test
index 627e86462a1..543b587c5e6 100644
--- a/mysql-test/main/mdev-21101.test
+++ b/mysql-test/main/mdev-21101.test
@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/not_aix.inc
 # Test that wait_timeout does not cause connection to be closed, when connection is delayed due to
 # threadpool internal problems, e.g misconfiguration - too few threads and queueing.
 # So if client did not cause wait_timeout, do not report it either.
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 86f2d6c0c18..5100b4137a2 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -49,6 +49,7 @@ sub skip_combinations {
              unless $ENV{HA_EXAMPLE_SO};
 
   $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
+  $skip{'include/not_aix.inc'} = 'Requires not AIX' if IS_AIX;
 
   $skip{'main/plugin_loaderr.test'} = 'needs compiled-in innodb'
             unless $::mysqld_variables{'innodb'} eq "ON";