diff --git a/java/src/main/java/cucumber/runtime/java/ClasspathMethodScanner.java b/java/src/main/java/cucumber/runtime/java/ClasspathMethodScanner.java
index 28c3fb9cb1..f516c69ff6 100644
--- a/java/src/main/java/cucumber/runtime/java/ClasspathMethodScanner.java
+++ b/java/src/main/java/cucumber/runtime/java/ClasspathMethodScanner.java
@@ -25,12 +25,8 @@ public void scan(JavaBackend javaBackend, List<String> gluePaths) {
         for (String gluePath : gluePaths) {
             String packageName = gluePath.replace('/', '.').replace('\\', '.'); // Sometimes the gluePath will be a path, not a package
             for (Class<?> candidateClass : resourceLoader.getDescendants(Object.class, packageName)) {
-                while (candidateClass != Object.class) {
+                while (candidateClass != Object.class && !Utils.isInstantiable(candidateClass)) {
                     // those can't be instantiated without container class present.
-                    boolean nonStaticInnerClass = candidateClass.getEnclosingClass() != null && !Modifier.isStatic(candidateClass.getModifiers());
-                    if (!nonStaticInnerClass && Utils.isInstantiable(candidateClass)) {
-                        break;
-                    }
                     candidateClass = candidateClass.getSuperclass();
                 }
                 for (Method method : candidateClass.getMethods()) {