diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt
index aeaf162d83c1..c4f553b839f8 100644
--- a/compiler-rt/test/builtins/CMakeLists.txt
+++ b/compiler-rt/test/builtins/CMakeLists.txt
@@ -23,10 +23,13 @@ configure_lit_site_cfg(
 
 include(builtin-config-ix)
 
-if (COMPILER_RT_BUILD_CRT AND TARGET crt)
-  list(APPEND BUILTINS_TEST_DEPS crt)
+if (COMPILER_RT_BUILD_CRT AND COMPILER_RT_HAS_CRT)
+  if (TARGET crt)
+    list(APPEND BUILTINS_TEST_DEPS crt)
+  endif()
+  set(COMPILER_RT_TEST_CRT ON)
 endif()
-pythonize_bool(COMPILER_RT_BUILD_CRT)
+pythonize_bool(COMPILER_RT_TEST_CRT)
 
 # Indicate if this is an MSVC environment.
 pythonize_bool(MSVC)
diff --git a/compiler-rt/test/builtins/Unit/lit.cfg.py b/compiler-rt/test/builtins/Unit/lit.cfg.py
index 2d503b30a315..8d602d1c417f 100644
--- a/compiler-rt/test/builtins/Unit/lit.cfg.py
+++ b/compiler-rt/test/builtins/Unit/lit.cfg.py
@@ -109,8 +109,8 @@ else:
     else:
         config.substitutions.append(("%librt ", base_lib + " -lc -lm "))
 
-builtins_build_crt = get_required_attr(config, "builtins_build_crt")
-if builtins_build_crt:
+builtins_test_crt = get_required_attr(config, "builtins_test_crt")
+if builtins_test_crt:
     base_obj = os.path.join(
         config.compiler_rt_libdir, "clang_rt.%%s%s.o" % config.target_suffix
     )
diff --git a/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in b/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
index a42d5c1d3e90..91675d62f7dc 100644
--- a/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
+++ b/compiler-rt/test/builtins/Unit/lit.site.cfg.py.in
@@ -5,7 +5,7 @@ config.builtins_lit_source_dir = "@BUILTINS_LIT_SOURCE_DIR@/Unit"
 config.target_cflags = "@BUILTINS_TEST_TARGET_CFLAGS@"
 config.target_arch = "@BUILTINS_TEST_TARGET_ARCH@"
 config.sanitizer_cxx_lib = "@SANITIZER_TEST_CXX_LIBNAME@"
-config.builtins_build_crt = @COMPILER_RT_BUILD_CRT_PYBOOL@
+config.builtins_test_crt = @COMPILER_RT_TEST_CRT_PYBOOL@
 config.is_msvc = @MSVC_PYBOOL@
 config.builtins_is_msvc = @BUILTINS_IS_MSVC_PYBOOL@
 config.builtins_lit_source_features = "@BUILTINS_LIT_SOURCE_FEATURES@"