diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py
--- a/llvm/utils/lit/lit/llvm/config.py
+++ b/llvm/utils/lit/lit/llvm/config.py
@@ -51,12 +51,14 @@
         elif platform.system() == 'Windows':
             # For tests that require Windows to run.
             features.add('system-windows')
-        elif platform.system() == "Linux":
+        elif platform.system() == 'Linux':
             features.add('system-linux')
         elif platform.system() in ['FreeBSD']:
             features.add('system-freebsd')
-        elif platform.system() == "NetBSD":
+        elif platform.system() == 'NetBSD':
             features.add('system-netbsd')
+        elif platform.system() == 'AIX':
+            features.add('system-aix')
 
         # Native compilation: host arch == default triple arch
         # Both of these values should probably be in every site config (e.g. as
diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg
--- a/llvm/utils/lit/tests/lit.cfg
+++ b/llvm/utils/lit/tests/lit.cfg
@@ -87,7 +87,7 @@
   if sys.platform.startswith('win') or sys.platform.startswith('cygwin'):
     config.available_features.add('system-windows')
   if platform.system() == 'AIX':
-    config.available_features.add('aix')
+    config.available_features.add('system-aix')
 
 # For each of lit's internal shell commands ('env', 'cd', 'diff', etc.), put
 # a fake command that always fails at the start of PATH.  This helps us check
diff --git a/llvm/utils/lit/tests/shtest-format-argv0.py b/llvm/utils/lit/tests/shtest-format-argv0.py
--- a/llvm/utils/lit/tests/shtest-format-argv0.py
+++ b/llvm/utils/lit/tests/shtest-format-argv0.py
@@ -5,7 +5,7 @@
 #
 # This test is not supported on AIX since `[` is only available as a shell builtin
 # and is not installed under PATH by default.
-# UNSUPPORTED: aix
+# UNSUPPORTED: system-aix
 #
 # RUN: %{lit} -j 1 -v %{inputs}/shtest-format-argv0 | FileCheck %s