diff --git a/mlir/include/mlir/Dialect/Tosa/Transforms/Passes.td b/mlir/include/mlir/Dialect/Tosa/Transforms/Passes.td
--- a/mlir/include/mlir/Dialect/Tosa/Transforms/Passes.td
+++ b/mlir/include/mlir/Dialect/Tosa/Transforms/Passes.td
@@ -24,14 +24,3 @@
 
   let constructor = "createTosaMakeBroadcastablePass()";
 }
-
-// TOSA Test Passes
-
-def TosaTestQuantUtils : FunctionPass<"tosa-test-quant-utils"> {
-  let summary = "TOSA Test: Exercise the APIs in QuantUtils.cpp";
-  let description = [{
-    Exercises the API that builds a quantized type from min/max quantized range.
-  }];
-
-  let constructor = "createTosaTestQuantUtilAPIPass()";
-}
diff --git a/mlir/test/lib/Dialect/Tosa/TosaTestPasses.cpp b/mlir/test/lib/Dialect/Tosa/TosaTestPasses.cpp
--- a/mlir/test/lib/Dialect/Tosa/TosaTestPasses.cpp
+++ b/mlir/test/lib/Dialect/Tosa/TosaTestPasses.cpp
@@ -20,6 +20,8 @@
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
 
+#define PASS_NAME "tosa-test-quant-utils"
+
 using namespace mlir;
 using namespace mlir::tosa;
 
@@ -176,7 +178,7 @@
 namespace {
 
 struct TosaTestQuantUtilAPI
-    : public TosaTestQuantUtilsBase<TosaTestQuantUtilAPI> {
+    : public PassWrapper<TosaTestQuantUtilAPI, FunctionPass> {
   void runOnFunction() override;
 };
 
@@ -192,6 +194,9 @@
 
 } // anonymous namespace
 
-std::unique_ptr<Pass> mlir::tosa::createTosaTestQuantUtilAPIPass() {
-  return std::make_unique<TosaTestQuantUtilAPI>();
+namespace mlir {
+void registerTosaTestQuantUtilAPIPass() {
+  PassRegistration<TosaTestQuantUtilAPI>(
+      PASS_NAME, "TOSA Test: Exercise the APIs in QuantUtils.cpp.");
 }
+} // namespace mlir
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
@@ -48,6 +48,7 @@
 void registerTestSpirvEntryPointABIPass();
 void registerTestSpirvModuleCombinerPass();
 void registerTestTraitsPass();
+void registerTosaTestQuantUtilAPIPass();
 void registerVectorizerTestPass();
 
 namespace test {
@@ -111,6 +112,7 @@
   registerTestSpirvModuleCombinerPass();
   registerTestTraitsPass();
   registerVectorizerTestPass();
+  registerTosaTestQuantUtilAPIPass();
 
   test::registerConvertCallOpPass();
   test::registerInliner();