diff --git a/mlir/test/lib/CMakeLists.txt b/mlir/test/lib/CMakeLists.txt
--- a/mlir/test/lib/CMakeLists.txt
+++ b/mlir/test/lib/CMakeLists.txt
@@ -2,5 +2,4 @@
 add_subdirectory(Dialect)
 add_subdirectory(IR)
 add_subdirectory(Pass)
-add_subdirectory(TestDialect)
 add_subdirectory(Transforms)
diff --git a/mlir/test/lib/Dialect/CMakeLists.txt b/mlir/test/lib/Dialect/CMakeLists.txt
--- a/mlir/test/lib/Dialect/CMakeLists.txt
+++ b/mlir/test/lib/Dialect/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(Affine)
 add_subdirectory(SPIRV)
+add_subdirectory(Test)
diff --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt
rename from mlir/test/lib/TestDialect/CMakeLists.txt
rename to mlir/test/lib/Dialect/Test/CMakeLists.txt
diff --git a/mlir/test/lib/TestDialect/TestDialect.h b/mlir/test/lib/Dialect/Test/TestDialect.h
rename from mlir/test/lib/TestDialect/TestDialect.h
rename to mlir/test/lib/Dialect/Test/TestDialect.h
diff --git a/mlir/test/lib/TestDialect/TestDialect.cpp b/mlir/test/lib/Dialect/Test/TestDialect.cpp
rename from mlir/test/lib/TestDialect/TestDialect.cpp
rename to mlir/test/lib/Dialect/Test/TestDialect.cpp
diff --git a/mlir/test/lib/TestDialect/TestOps.td b/mlir/test/lib/Dialect/Test/TestOps.td
rename from mlir/test/lib/TestDialect/TestOps.td
rename to mlir/test/lib/Dialect/Test/TestOps.td
diff --git a/mlir/test/lib/TestDialect/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp
rename from mlir/test/lib/TestDialect/TestPatterns.cpp
rename to mlir/test/lib/Dialect/Test/TestPatterns.cpp
diff --git a/mlir/test/lib/TestDialect/lit.local.cfg b/mlir/test/lib/Dialect/Test/lit.local.cfg
rename from mlir/test/lib/TestDialect/lit.local.cfg
rename to mlir/test/lib/Dialect/Test/lit.local.cfg
diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt
--- a/mlir/test/lib/IR/CMakeLists.txt
+++ b/mlir/test/lib/IR/CMakeLists.txt
@@ -6,8 +6,8 @@
 
   ADDITIONAL_HEADER_DIRS
   )
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test)
 
 target_link_libraries(MLIRTestIR
   PUBLIC
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
@@ -28,8 +28,8 @@
   MLIRTestVectorTransformPatternsIncGen
 )
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)