diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -6,12 +6,8 @@
   InferTypeOpInterface.cpp
   Liveness.cpp
   LoopAnalysis.cpp
-  MemRefBoundCheck.cpp
   NestedMatcher.cpp
-  OpStats.cpp
   SliceAnalysis.cpp
-  TestMemRefDependenceCheck.cpp
-  TestParallelismDetection.cpp
   Utils.cpp
   Verifier.cpp
 
diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
--- a/mlir/lib/Transforms/CMakeLists.txt
+++ b/mlir/lib/Transforms/CMakeLists.txt
@@ -14,6 +14,7 @@
   LoopUnrollAndJam.cpp
   LoopUnroll.cpp
   MemRefDataFlowOpt.cpp
+  OpStats.cpp
   PipelineDataTransfer.cpp
   SimplifyAffineStructures.cpp
   StripDebugInfo.cpp
diff --git a/mlir/lib/Analysis/OpStats.cpp b/mlir/lib/Transforms/OpStats.cpp
rename from mlir/lib/Analysis/OpStats.cpp
rename to mlir/lib/Transforms/OpStats.cpp
diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
--- a/mlir/test/lib/Transforms/CMakeLists.txt
+++ b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -10,7 +10,10 @@
   TestLoopMapping.cpp
   TestLoopParametricTiling.cpp
   TestOpaqueLoc.cpp
+  MemRefBoundCheck.cpp
+  TestMemRefDependenceCheck.cpp
   TestMemRefStrideCalculation.cpp
+  TestParallelismDetection.cpp
   TestVectorToLoopsConversion.cpp
   TestVectorTransforms.cpp
   TestVectorizationUtils.cpp
diff --git a/mlir/lib/Analysis/MemRefBoundCheck.cpp b/mlir/test/lib/Transforms/MemRefBoundCheck.cpp
rename from mlir/lib/Analysis/MemRefBoundCheck.cpp
rename to mlir/test/lib/Transforms/MemRefBoundCheck.cpp
diff --git a/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp b/mlir/test/lib/Transforms/TestMemRefDependenceCheck.cpp
rename from mlir/lib/Analysis/TestMemRefDependenceCheck.cpp
rename to mlir/test/lib/Transforms/TestMemRefDependenceCheck.cpp
diff --git a/mlir/lib/Analysis/TestParallelismDetection.cpp b/mlir/test/lib/Transforms/TestParallelismDetection.cpp
rename from mlir/lib/Analysis/TestParallelismDetection.cpp
rename to mlir/test/lib/Transforms/TestParallelismDetection.cpp