diff --git a/llvm/utils/gn/secondary/clang-tools-extra/include-cleaner/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/include-cleaner/unittests/BUILD.gn
new file mode 100644
index 000000000000..e88d20ad9987
--- /dev/null
+++ b/llvm/utils/gn/secondary/clang-tools-extra/include-cleaner/unittests/BUILD.gn
@@ -0,0 +1,32 @@
+import("//third-party/unittest/unittest.gni")
+
+unittest("ClangIncludeCleanerTests") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/include-cleaner/lib",
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Testing",
+    "//clang/lib/Tooling/Inclusions/Stdlib",
+    "//llvm/lib/Support",
+    "//llvm/lib/Testing/Annotations",
+    "//llvm/lib/Testing/Support",
+  ]
+  include_dirs = [
+    "../lib",
+    "../include",
+  ]
+  sources = [
+    "AnalysisTest.cpp",
+    "FindHeadersTest.cpp",
+    "IncludeSpellerTest.cpp",
+    "LocateSymbolTest.cpp",
+    "RecordTest.cpp",
+    "TypesTest.cpp",
+    "WalkASTTest.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn
index ab8c48d0a1c6..71f4ceae7cab 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/BUILD.gn
@@ -10,6 +10,7 @@ group("unittests") {
     "clang-move:ClangMoveTests",
     "clang-query:ClangQueryTests",
     "clang-tidy:ClangTidyTests",
+    "//clang-tools-extra/include-cleaner/unittests:ClangIncludeCleanerTests",
   ]
   testonly = true
 }