diff --git a/test/lit.cfg b/test/lit.cfg
index 1cb8896e0a5..fb5005e2998 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -553,5 +553,5 @@ if config.have_libxar:
 if config.enable_abi_breaking_checks == "1":
     config.available_features.add('abi-breaking-checks')
 
-if config.llvm_disable_libxml2 == "OFF" and config.have_libxml2 == "TRUE":
+if config.llvm_libxml2_enabled == "1":
     config.available_features.add('libxml2')
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 67683d793aa..6de225ecc58 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -40,8 +40,7 @@ config.have_libxar = @HAVE_LIBXAR@
 config.have_dia_sdk = @LLVM_ENABLE_DIA_SDK@
 config.enable_ffi = @LLVM_ENABLE_FFI@
 config.build_shared_libs = @BUILD_SHARED_LIBS@
-config.llvm_disable_libxml2 = "@LLVM_DISABLE_LIBXML2@"
-config.have_libxml2 = "@LIBXML2_FOUND@"
+config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.