diff --git a/src/test/java/org/apache/sling/query/impl/iterator/ReverseTest.java b/src/test/java/org/apache/sling/query/impl/iterator/ReverseTest.java
index 0e1808d..6ac28b1 100644
--- a/src/test/java/org/apache/sling/query/impl/iterator/ReverseTest.java
+++ b/src/test/java/org/apache/sling/query/impl/iterator/ReverseTest.java
@@ -19,6 +19,8 @@
 
 package org.apache.sling.query.impl.iterator;
 
+import static org.apache.sling.query.TestUtils.l;
+
 import java.util.Iterator;
 import java.util.List;
 
@@ -27,12 +29,9 @@
 import org.apache.sling.query.api.internal.Option;
 import org.apache.sling.query.impl.function.IdentityFunction;
 import org.apache.sling.query.impl.function.SliceFunction;
-import org.apache.sling.query.impl.iterator.ReverseIterator;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.apache.sling.query.TestUtils.l;
-
 public class ReverseTest {
 
     @Test
diff --git a/src/test/java/org/apache/sling/query/impl/iterator/SuppTest.java b/src/test/java/org/apache/sling/query/impl/iterator/SuppTest.java
index 031605e..9aafdd2 100644
--- a/src/test/java/org/apache/sling/query/impl/iterator/SuppTest.java
+++ b/src/test/java/org/apache/sling/query/impl/iterator/SuppTest.java
@@ -19,6 +19,8 @@
 
 package org.apache.sling.query.impl.iterator;
 
+import static org.apache.sling.query.TestUtils.l;
+
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -30,12 +32,9 @@
 import org.apache.sling.query.impl.function.IdentityFunction;
 import org.apache.sling.query.impl.function.IteratorToIteratorFunctionWrapper;
 import org.apache.sling.query.impl.function.SliceFunction;
-import org.apache.sling.query.impl.iterator.SuppIterator;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.apache.sling.query.TestUtils.l;
-
 public class SuppTest {
 
     @Test
diff --git a/src/test/java/org/apache/sling/query/impl/selector/parser/JcrSelectorTest.java b/src/test/java/org/apache/sling/query/impl/selector/parser/JcrSelectorTest.java
index b8a53e4..9b624ef 100644
--- a/src/test/java/org/apache/sling/query/impl/selector/parser/JcrSelectorTest.java
+++ b/src/test/java/org/apache/sling/query/impl/selector/parser/JcrSelectorTest.java
@@ -22,9 +22,6 @@
 import java.util.List;
 
 import org.apache.sling.query.impl.resource.jcr.query.JcrQueryBuilder;
-import org.apache.sling.query.impl.selector.parser.Selector;
-import org.apache.sling.query.impl.selector.parser.SelectorParser;
-import org.apache.sling.query.impl.selector.parser.SelectorSegment;
 import org.apache.sling.query.mock.MockTypeResolver;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/query/impl/selector/parser/SelectorTest.java b/src/test/java/org/apache/sling/query/impl/selector/parser/SelectorTest.java
index 030b0c3..ccfdaea 100644
--- a/src/test/java/org/apache/sling/query/impl/selector/parser/SelectorTest.java
+++ b/src/test/java/org/apache/sling/query/impl/selector/parser/SelectorTest.java
@@ -23,10 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.sling.query.impl.selector.parser.Attribute;
-import org.apache.sling.query.impl.selector.parser.Modifier;
-import org.apache.sling.query.impl.selector.parser.SelectorParser;
-import org.apache.sling.query.impl.selector.parser.SelectorSegment;
 import org.junit.Assert;
 import org.junit.Test;