diff --git a/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/MigrateHandlerInterceptorTest.java b/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/MigrateHandlerInterceptorTest.java
index 3117c571..422a52f0 100644
--- a/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/MigrateHandlerInterceptorTest.java
+++ b/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/MigrateHandlerInterceptorTest.java
@@ -17,6 +17,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
+import org.openrewrite.Issue;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.spring.framework.MigrateHandlerInterceptor;
 import org.openrewrite.test.RecipeSpec;
@@ -67,23 +68,18 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         );
     }
 
+    @Issue("https://github.com/openrewrite/rewrite-spring/issues/620")
     @Test
     void doesNotReplaceInterceptorsExtendingOwnInterceptors() {
         //language=java
         rewriteRun(
+          // Do change classes that directly extend HandlerInterceptorAdapter
           java(
             """
               import javax.servlet.http.*;
 
               import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
-              class MyInterceptor extends MySuperInterceptor {
-                  @Override
-                  public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-                      return super.preHandle(request, response, handler);
-                  }
-              }
-
               class MySuperInterceptor extends HandlerInterceptorAdapter {
                   @Override
                   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
@@ -96,13 +92,6 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
               import org.springframework.web.servlet.HandlerInterceptor;
 
-              class MyInterceptor extends MySuperInterceptor {
-                  @Override
-                  public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-                      return super.preHandle(request, response, handler);
-                  }
-              }
-
               class MySuperInterceptor implements HandlerInterceptor {
                   @Override
                   public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
@@ -110,37 +99,21 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                   }
               }
               """
-          )
-        );
-    }
-
-    @Test
-    void unusedImportOfHandlerInterceptorAdapterAndHasASuperCallShouldDoNothing() {
-        //language=java
-        rewriteRun(
+          ),
+          // But do not change classes that transitively extend HandlerInterceptorAdapter
           java(
             """
-              import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+              import javax.servlet.http.*;
 
-              class MyInterceptorLike extends MySuperInterceptor {
-                  @Override
-                  public boolean test() {
-                      return super.test();
-                  }
+              import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; // Unused but untouched
+
+              class MyInterceptor extends MySuperInterceptor {
                   @Override
-                  public boolean test2() {
-                      return super.test();
+                  public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+                      return super.preHandle(request, response, handler);
                   }
               }
-
-              class MySuperInterceptor {
-                  public boolean test() {
-                      return true;
-                  }
-                  public boolean test2() {
-                      return true;
-                  }
-              }"""
+              """
           )
         );
     }