diff --git a/approvaltests/src/main/java/org/approvaltests/integrations/junit5/JupiterApprovals.java b/approvaltests/src/main/java/org/approvaltests/integrations/junit5/JupiterApprovals.java
index ab027b88c..7dbc64e47 100644
--- a/approvaltests/src/main/java/org/approvaltests/integrations/junit5/JupiterApprovals.java
+++ b/approvaltests/src/main/java/org/approvaltests/integrations/junit5/JupiterApprovals.java
@@ -3,10 +3,7 @@
 import org.approvaltests.Approvals;
 import org.approvaltests.core.Experimental;
 import org.approvaltests.core.Options;
-import org.approvaltests.namer.NamedEnvironment;
-import org.approvaltests.namer.NamerFactory;
 import org.junit.jupiter.api.DynamicTest;
-import org.lambda.actions.Action0;
 import org.lambda.actions.Action1;
 
 public class JupiterApprovals
diff --git a/approvaltests/src/main/java/org/approvaltests/namer/AttributeStackSelector.java b/approvaltests/src/main/java/org/approvaltests/namer/AttributeStackSelector.java
index 350c0ccda..da680a763 100644
--- a/approvaltests/src/main/java/org/approvaltests/namer/AttributeStackSelector.java
+++ b/approvaltests/src/main/java/org/approvaltests/namer/AttributeStackSelector.java
@@ -6,6 +6,7 @@
 import com.spun.util.io.StackElementSelector;
 import com.spun.util.tests.TestUtils;
 import org.approvaltests.integrations.junit5.JUnitUtils;
+import org.lambda.query.Queryable;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -142,12 +143,8 @@ private static void checkConditionsForAttribute(Class<? extends Annotation> attr
   private static boolean isDynamicWrapperPresent()
   {
     StackTraceElement[] stackTrace = ThreadUtils.getStackTrace();
-    for (StackTraceElement stackTraceElement : stackTrace)
-    {
-      if ("org.approvaltests.integrations.junit5.JupiterApprovals".equals(stackTraceElement.getClassName()))
-      { return true; }
-    }
-    return false;
+    return Queryable.as(stackTrace)
+        .any(stackTraceElement -> "org.approvaltests.integrations.junit5.JupiterApprovals".equals(stackTraceElement.getClassName()));
   }
   public static List<Method> getMethodsByName(Class<?> clazz, String methodName)
   {