diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(Dialect)
 add_subdirectory(EDSC)
 add_subdirectory(mlir-cpu-runner)
 add_subdirectory(SDBM)
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
@@ -1,4 +1,5 @@
 add_subdirectory(DeclarativeTransforms)
+add_subdirectory(Dialect)
 add_subdirectory(IR)
 add_subdirectory(Pass)
 add_subdirectory(TestDialect)
diff --git a/mlir/test/Dialect/CMakeLists.txt b/mlir/test/lib/Dialect/CMakeLists.txt
rename from mlir/test/Dialect/CMakeLists.txt
rename to mlir/test/lib/Dialect/CMakeLists.txt
diff --git a/mlir/test/Dialect/SPIRV/CMakeLists.txt b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
rename from mlir/test/Dialect/SPIRV/CMakeLists.txt
rename to mlir/test/lib/Dialect/SPIRV/CMakeLists.txt
diff --git a/mlir/test/Dialect/SPIRV/TestAvailability.cpp b/mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
rename from mlir/test/Dialect/SPIRV/TestAvailability.cpp
rename to mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
--- a/mlir/test/Dialect/SPIRV/TestAvailability.cpp
+++ b/mlir/test/lib/Dialect/SPIRV/TestAvailability.cpp
@@ -75,9 +75,12 @@
   });
 }
 
-static PassRegistration<PrintOpAvailability>
-    printOpAvailabilityPass("test-spirv-op-availability",
-                            "Test SPIR-V op availability");
+namespace mlir {
+void registerPrintOpAvailabilityPass() {
+  PassRegistration<PrintOpAvailability> printOpAvailabilityPass(
+      "test-spirv-op-availability", "Test SPIR-V op availability");
+}
+} // namespace mlir
 
 //===----------------------------------------------------------------------===//
 // Converting target environment pass
diff --git a/mlir/tools/mlir-opt/mlir-opt.cpp b/mlir/tools/mlir-opt/mlir-opt.cpp
--- a/mlir/tools/mlir-opt/mlir-opt.cpp
+++ b/mlir/tools/mlir-opt/mlir-opt.cpp
@@ -32,6 +32,7 @@
 void registerMemRefBoundCheck();
 void registerPassManagerTestPass();
 void registerPatternsTestPass();
+void registerPrintOpAvailabilityPass();
 void registerSimpleParametricTilingPass();
 void registerSymbolTestPasses();
 void registerTestAffineDataCopyPass();
@@ -84,6 +85,7 @@
   registerMemRefBoundCheck();
   registerPassManagerTestPass();
   registerPatternsTestPass();
+  registerPrintOpAvailabilityPass();
   registerSimpleParametricTilingPass();
   registerSymbolTestPasses();
   registerTestAffineDataCopyPass();