diff --git a/mlir/include/mlir/Support/DebugAction.h b/mlir/include/mlir/Support/DebugAction.h
--- a/mlir/include/mlir/Support/DebugAction.h
+++ b/mlir/include/mlir/Support/DebugAction.h
@@ -190,14 +190,12 @@
 /// This class provides a handler class that can be derived from to handle
 /// instances of this action. The parameters to its query methods map 1-1 to the
 /// types on the action type.
-template <typename... ParameterTs>
+template <typename Derived, typename... ParameterTs>
 class DebugAction {
 public:
   class Handler : public DebugActionManager::HandlerBase {
   public:
-    Handler()
-        : HandlerBase(
-              TypeID::get<typename DebugAction<ParameterTs...>::Handler>()) {}
+    Handler() : HandlerBase(TypeID::get<DebugAction::Handler>()) {}
 
     /// This hook allows for controlling whether an action should execute or
     /// not. `parameters` correspond to the set of values provided by the
@@ -209,8 +207,7 @@
 
     /// Provide classof to allow casting between handler types.
     static bool classof(const DebugActionManager::HandlerBase *handler) {
-      return handler->getHandlerID() ==
-             TypeID::get<typename DebugAction<ParameterTs...>::Handler>();
+      return handler->getHandlerID() == TypeID::get<DebugAction::Handler>();
     }
   };
 
diff --git a/mlir/unittests/Support/DebugActionTest.cpp b/mlir/unittests/Support/DebugActionTest.cpp
--- a/mlir/unittests/Support/DebugActionTest.cpp
+++ b/mlir/unittests/Support/DebugActionTest.cpp
@@ -15,11 +15,17 @@
 using namespace mlir;
 
 namespace {
-struct SimpleAction : public DebugAction<> {
+struct SimpleAction : DebugAction<SimpleAction> {
   static StringRef getTag() { return "simple-action"; }
   static StringRef getDescription() { return "simple-action-description"; }
 };
-struct ParametricAction : public DebugAction<bool> {
+struct OtherSimpleAction : DebugAction<OtherSimpleAction> {
+  static StringRef getTag() { return "other-simple-action"; }
+  static StringRef getDescription() {
+    return "other-simple-action-description";
+  }
+};
+struct ParametricAction : DebugAction<ParametricAction, bool> {
   static StringRef getTag() { return "param-action"; }
   static StringRef getDescription() { return "param-action-description"; }
 };
@@ -29,7 +35,7 @@
 
   // A generic handler that always executes the simple action, but not the
   // parametric action.
-  struct GenericHandler : public DebugActionManager::GenericHandler {
+  struct GenericHandler : DebugActionManager::GenericHandler {
     FailureOr<bool> shouldExecute(StringRef tag, StringRef desc) final {
       if (tag == SimpleAction::getTag()) {
         EXPECT_EQ(desc, SimpleAction::getDescription());
@@ -51,7 +57,7 @@
   DebugActionManager manager;
 
   // Handler that simply uses the input as the decider.
-  struct ActionSpecificHandler : public ParametricAction::Handler {
+  struct ActionSpecificHandler : ParametricAction::Handler {
     FailureOr<bool> shouldExecute(bool shouldExecuteParam) final {
       return shouldExecuteParam;
     }
@@ -69,7 +75,7 @@
   DebugActionManager manager;
 
   // Handler that uses the number of action executions as the decider.
-  struct DebugCounterHandler : public SimpleAction::Handler {
+  struct DebugCounterHandler : SimpleAction::Handler {
     FailureOr<bool> shouldExecute() final { return numExecutions++ < 3; }
     unsigned numExecutions = 0;
   };
@@ -83,6 +89,22 @@
   EXPECT_FALSE(manager.shouldExecute<SimpleAction>());
 }
 
+TEST(DebugActionTest, NonOverlappingActionSpecificHandlers) {
+  DebugActionManager manager;
+
+  // One handler returns true and another returns false
+  struct SimpleActionHandler : SimpleAction::Handler {
+    FailureOr<bool> shouldExecute() final { return true; }
+  };
+  struct OtherSimpleActionHandler : OtherSimpleAction::Handler {
+    FailureOr<bool> shouldExecute() final { return false; }
+  };
+  manager.registerActionHandler<SimpleActionHandler>();
+  manager.registerActionHandler<OtherSimpleActionHandler>();
+  EXPECT_TRUE(manager.shouldExecute<SimpleAction>());
+  EXPECT_FALSE(manager.shouldExecute<OtherSimpleAction>());
+}
+
 } // namespace
 
 #endif
diff --git a/mlir/unittests/Support/DebugCounterTest.cpp b/mlir/unittests/Support/DebugCounterTest.cpp
--- a/mlir/unittests/Support/DebugCounterTest.cpp
+++ b/mlir/unittests/Support/DebugCounterTest.cpp
@@ -16,7 +16,7 @@
 
 namespace {
 
-struct CounterAction : public DebugAction<> {
+struct CounterAction : public DebugAction<CounterAction> {
   static StringRef getTag() { return "counter-action"; }
   static StringRef getDescription() { return "Test action for debug counters"; }
 };