diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
--- a/clang/test/lit.cfg.py
+++ b/clang/test/lit.cfg.py
@@ -283,3 +283,6 @@
     config.environment['AIXTHREAD_STK'] = os.environ['AIXTHREAD_STK']
 elif platform.system() == 'AIX':
     config.environment['AIXTHREAD_STK'] = '4194304'
+
+if 'system-aix' in config.available_features:
+    config.substitutions.append(('llvm-nm', 'env OBJECT_MODE=any llvm-nm'))