diff --git a/test/lit.cfg b/test/lit.cfg
index e15dbbf6b77a7..99514d9637758 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -1441,10 +1441,10 @@ config.substitutions.append(('%target-sdk-name', config.target_sdk_name))
 
 # Add 'stdlib_dir' as the path to the stdlib resource directory
 stdlib_dir = os.path.join(config.swift_lib_dir, "swift")
-if platform.system() == 'Linux' or platform.system() == 'Windows':
-    stdlib_dir = os.path.join(stdlib_dir, config.target_sdk_name, run_cpu)
-else:
+if platform.system() == 'Darwin':
     stdlib_dir = os.path.join(stdlib_dir, config.target_sdk_name)
+else:
+    stdlib_dir = os.path.join(stdlib_dir, config.target_sdk_name, target_arch)
 config.substitutions.append(('%stdlib_dir', stdlib_dir))
 
 # Add 'stdlib_module' as the path to the stdlib .swiftmodule file