diff --git a/tools/clang/test/CMakeLists.txt b/tools/clang/test/CMakeLists.txt
index b55982177..b3043d311 100644
--- a/tools/clang/test/CMakeLists.txt
+++ b/tools/clang/test/CMakeLists.txt
@@ -20,8 +20,8 @@ configure_lit_site_cfg(
   )
 
 configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/clang-hlsl/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/clang-hlsl/lit.site.cfg
+  ${CMAKE_CURRENT_SOURCE_DIR}/taef/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
   )
 
 option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
@@ -100,11 +100,11 @@ add_lit_target("check-clang-unit" "Running lit suite clang-unit"
 
 # HLSL Change Begin - Add taef tests
 if (WIN32)
-  add_lit_target("check-hlsl" "Running lit suite hlsl"
-            ${CMAKE_CURRENT_SOURCE_DIR}/clang-hlsl
+  add_lit_target("check-clang-taef" "Running lit suite hlsl"
+            ${CMAKE_CURRENT_SOURCE_DIR}/taef
             PARAMS ${CLANG_TEST_PARAMS}
-                  clang_hlsl_site_config=${CMAKE_CURRENT_BINARY_DIR}/clang-hlsl/lit.site.cfg
-            DEPENDS clang-hlsl-tests
+                  clang_taef_site_config=${CMAKE_CURRENT_BINARY_DIR}/taef/lit.site.cfg
+            DEPENDS ClangHLSLTests
             ARGS ${CLANG_TEST_EXTRA_ARGS}
           )
 endif()
diff --git a/tools/clang/test/clang-hlsl/lit.cfg b/tools/clang/test/taef/lit.cfg
similarity index 94%
rename from tools/clang/test/clang-hlsl/lit.cfg
rename to tools/clang/test/taef/lit.cfg
index 7d3883ae7..773c144d2 100644
--- a/tools/clang/test/clang-hlsl/lit.cfg
+++ b/tools/clang/test/taef/lit.cfg
@@ -3,6 +3,7 @@
 # Configuration file for the 'lit' test runner.
 
 import os
+import platform
 
 import lit.formats
 import lit.util
@@ -19,7 +20,7 @@ if llvm_obj_root is None:
     # out-of-tree build situation).
 
     # Check for 'clang_unit_site_config' user parameter, and use that if available.
-    site_cfg = lit_config.params.get('clang_hlsl_site_config', None)
+    site_cfg = lit_config.params.get('clang_taef_site_config', None)
     if site_cfg and os.path.exists(site_cfg):
         lit_config.load_config(config, site_cfg)
         raise SystemExit
diff --git a/tools/clang/test/clang-hlsl/lit.site.cfg.in b/tools/clang/test/taef/lit.site.cfg.in
similarity index 100%
rename from tools/clang/test/clang-hlsl/lit.site.cfg.in
rename to tools/clang/test/taef/lit.site.cfg.in