diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java
index ea083cda0..8461b245f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadata.java
@@ -13,9 +13,10 @@
  */
 package com.mysema.query.types;
 
+import java.io.Serializable;
+
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
-import java.io.Serializable;
 
 import com.google.common.base.Objects;
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java
index 08b86de1d..a390fb99b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ValidatingVisitor.java
@@ -13,12 +13,13 @@
  */
 package com.mysema.query.types;
 
+import static com.mysema.query.util.CollectionUtils.add;
+
 import java.io.Serializable;
 import java.util.Set;
 
 import com.mysema.query.JoinExpression;
 import com.mysema.query.QueryMetadata;
-import static com.mysema.query.util.CollectionUtils.add;
 
 /**
  * ValidatingVisitor visits expressions and ensures that only known path instances are used
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAListAccessVisitor.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAListAccessVisitor.java
index 51152ce4f..d0737077c 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAListAccessVisitor.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAListAccessVisitor.java
@@ -1,8 +1,9 @@
 package com.mysema.query.jpa;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 import com.google.common.collect.Maps;
 import com.mysema.query.JoinType;
 import com.mysema.query.QueryMetadata;
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAMapAccessVisitor.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAMapAccessVisitor.java
index a92d07760..427db9f05 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAMapAccessVisitor.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPAMapAccessVisitor.java
@@ -1,8 +1,9 @@
 package com.mysema.query.jpa;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 import com.google.common.collect.Maps;
 import com.mysema.query.JoinType;
 import com.mysema.query.QueryMetadata;
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java
index be939528a..7d7e0b51a 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java
@@ -13,10 +13,11 @@
  */
 package com.mysema.query.jpa;
 
-import com.mysema.query.types.Expression;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.mysema.query.types.Expression;
+
 public abstract class AbstractQueryTest implements Constants {
 
     protected QueryHelper query() {
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
index eb51d91bf..8f1974f90 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/ParsingTest.java
@@ -13,8 +13,14 @@
  */
 package com.mysema.query.jpa;
 
-import antlr.RecognitionException;
-import antlr.TokenStreamException;
+import static com.mysema.query.Target.*;
+import static com.mysema.query.alias.Alias.$;
+import static com.mysema.query.alias.Alias.alias;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
 import com.mysema.query.NoBatooJPA;
 import com.mysema.query.NoEclipseLink;
 import com.mysema.query.NoOpenJPA;
@@ -23,12 +29,9 @@ import com.mysema.query.types.expr.ComparableExpression;
 import com.mysema.query.types.expr.DateExpression;
 import com.mysema.query.types.expr.NumberExpression;
 import com.mysema.testutil.ExcludeIn;
-import org.junit.Ignore;
-import org.junit.Test;
-import static com.mysema.query.Target.*;
-import static com.mysema.query.alias.Alias.$;
-import static com.mysema.query.alias.Alias.alias;
-import static org.junit.Assert.assertEquals;
+
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
 
 public class ParsingTest extends AbstractQueryTest {
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java
index 918efb5cb..7a6040853 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/SubQueryTest.java
@@ -13,11 +13,13 @@
  */
 package com.mysema.query.jpa;
 
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
 import com.mysema.query.domain.QCat;
 import com.mysema.query.jpa.domain.QEmployee;
 import com.mysema.query.jpa.domain.QUser;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
 
 public class SubQueryTest extends AbstractQueryTest{
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java
index c9598cfc5..35bb20a89 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Cat.java
@@ -13,11 +13,12 @@
  */
 package com.mysema.query.jpa.domain;
 
-import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import javax.persistence.*;
+
 /**
  * The Class Cat.
  */
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java
index 1b98e6dec..847a2cd43 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Order.java
@@ -13,9 +13,10 @@
  */
 package com.mysema.query.jpa.domain;
 
-import javax.persistence.*;
 import java.util.List;
 
+import javax.persistence.*;
+
 /**
  * The Class Order.
  */