diff --git a/sycl/test/self-contained-headers/lit.local.cfg b/sycl/test/self-contained-headers/lit.local.cfg
index 767afc0f1b74e..30a1d3e1a195c 100644
--- a/sycl/test/self-contained-headers/lit.local.cfg
+++ b/sycl/test/self-contained-headers/lit.local.cfg
@@ -7,8 +7,4 @@ config.test_format = SYCLHeadersTest()
 # standalone. `os.path.join` is required here so the filtering works
 # cross-platform
 config.sycl_headers_xfail = [
-    # FIXME: remove this rule when the header is moved to the clang project
-    os.path.join(
-        "sycl", "stl_wrappers", "__sycl_cmath_wrapper_impl.hpp"
-    ),
 ]
diff --git a/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp
new file mode 100755
index 0000000000000..ca7ca5259c340
--- /dev/null
+++ b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp
@@ -0,0 +1,11 @@
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s
+// expected-no-diagnostics
+//
+// XFAIL: !system-windows
+// UNSUPPORTED: system-windows
+// Different versions of STL implementations by Microsoft either implicitly
+// include cmath or not. It means the test result depends on the system
+// environment.
+
+// TODO: Longer term that header should really be moved to the clang project.
+#include <sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp>