diff --git a/mlir/unittests/Analysis/CMakeLists.txt b/mlir/unittests/Analysis/CMakeLists.txt
index 3346426fa036..b6340ec72812 100644
--- a/mlir/unittests/Analysis/CMakeLists.txt
+++ b/mlir/unittests/Analysis/CMakeLists.txt
@@ -7,7 +7,7 @@ add_mlir_unittest(MLIRAnalysisTests
 )
 
 target_link_libraries(MLIRAnalysisTests
-  PRIVATE 
+  PRIVATE
   MLIRLoopAnalysis
   MLIRParser
   )
diff --git a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel
index ff22e88a10a4..5ee06e75f435 100644
--- a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel
@@ -75,6 +75,20 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "rewrite_tests",
+    size = "small",
+    srcs = glob([
+        "Rewrite/*.cpp",
+        "Rewrite/*.h",
+    ]),
+    deps = [
+        "//llvm:gtest_main",
+        "//mlir:IR",
+        "//mlir:Rewrite",
+    ],
+)
+
 cc_test(
     name = "dialect_tests",
     size = "small",
@@ -243,6 +257,19 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "transforms_test",
+    size = "small",
+    srcs = glob([
+        "Transforms/*.cpp",
+        "Transforms/*.h",
+    ]),
+    deps = [
+        "//llvm:gtest_main",
+        "//mlir:TransformUtils",
+    ],
+)
+
 cc_test(
     name = "analysis_tests",
     size = "small",
@@ -260,6 +287,22 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "conversion_tests",
+    size = "small",
+    srcs = glob([
+        "Conversion/*.cpp",
+        "Conversion/*.h",
+        "Conversion/*/*.cpp",
+        "Conversion/*/*.h",
+    ]),
+    deps = [
+        "//llvm:gtest_main",
+        "//mlir:ArithmeticDialect",
+        "//mlir:PDLToPDLInterp",
+    ],
+)
+
 cc_test(
     name = "execution_engine_tests",
     size = "small",