diff --git a/test/lit.cfg b/test/lit.cfg
index ca4dd438242c8..e8a4a36443fbf 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -702,10 +702,10 @@ config.substitutions.append(('%target-cpu', run_cpu))
 target_os_abi = run_os
 target_os_is_maccatalyst = "FALSE"
 target_mandates_stable_abi = "FALSE"
-if (run_cpu == 'arm64e'):
+if run_cpu in ('arm64e',):
   target_mandates_stable_abi = "TRUE"
   config.available_features.add('swift_only_stable_abi')
-if (run_os == 'maccatalyst'):
+if run_os in ('maccatalyst',):
   # For purposes of ABI, treat maccatalyst as macosx since the maccatalyst ABI
   # must match the macosx ABI.
   target_os_abi = 'macosx'
@@ -715,7 +715,12 @@ if (run_os == 'maccatalyst'):
 if run_os in ('macosx',) and run_cpu in ('arm64',):
   target_mandates_stable_abi = "TRUE"
   config.available_features.add('swift_only_stable_abi')
-if (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-cygnus', 'windows-gnu', 'windows-msvc', 'linux-android', 'linux-androideabi']):
+if run_os in (
+              'linux-android', 'linux-androideabi',             # Android
+              'freebsd', 'openbsd',                             # BSD
+              'linux-gnu', 'linux-gnueabihf',                   # Linux
+              'windows-cygnus', 'windows-gnu', 'windows-msvc',  # Windows
+             ):
   target_mandates_stable_abi = "TRUE"
   config.available_features.add('swift_only_stable_abi')
 config.substitutions.append(('%target-os-abi', target_os_abi))