diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
index 4dfa3538a..a1975f499 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
@@ -10,7 +10,6 @@ import java.util.Map;
 
 import javax.annotation.Nullable;
 import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
 import javax.persistence.Query;
 
 import org.slf4j.Logger;
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java
index 2d5030bc6..5f2176bd6 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Calendar.java
@@ -8,18 +8,17 @@ package com.mysema.query.jpa.domain;
 import java.io.Serializable;
 import java.util.Map;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.annotations.CollectionOfElements;
-
 /**
  * The Class Calendar.
  */
 @SuppressWarnings("serial")
 @Entity
 public class Calendar implements Serializable{
-    @CollectionOfElements
+    @ElementCollection
     Map<String, java.util.Date> holidays;
 
     @Id
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java
index ad5e68d81..0df71cd47 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Foo.java
@@ -7,12 +7,12 @@ package com.mysema.query.jpa.domain;
 
 import java.util.List;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.IndexColumn;
 
 /**
@@ -25,7 +25,7 @@ public class Foo {
     @Id
     int id;
 
-    @CollectionOfElements
+    @ElementCollection
     @IndexColumn(name = "_index")
     List<String> names;
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java
index a0f79045c..080792566 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/FooDTO.java
@@ -7,12 +7,11 @@ package com.mysema.query.jpa.domain;
 
 import java.util.List;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Id;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.hibernate.annotations.CollectionOfElements;
-
 import com.mysema.query.annotations.QueryProjection;
 
 public class FooDTO {
@@ -21,7 +20,7 @@ public class FooDTO {
     @Id
     int id;
 
-    @CollectionOfElements
+    @ElementCollection
     List<String> names;
 
     @Temporal(TemporalType.DATE)
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java
index 678a3b27c..44bf6f50a 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/NameList.java
@@ -7,11 +7,10 @@ package com.mysema.query.jpa.domain;
 
 import java.util.Collection;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.annotations.CollectionOfElements;
-
 /**
  * The Class NameList.
  */
@@ -19,6 +18,6 @@ import org.hibernate.annotations.CollectionOfElements;
 public class NameList {
     @Id
     long id;
-    @CollectionOfElements
+    @ElementCollection
     Collection<String> names;
 }
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 ed93c2cce..b38df53c9 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
@@ -7,13 +7,13 @@ package com.mysema.query.jpa.domain;
 
 import java.util.List;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.IndexColumn;
 
 /**
@@ -25,7 +25,7 @@ public class Order {
     @ManyToOne
     Customer customer;
 
-    @CollectionOfElements
+    @ElementCollection
     @IndexColumn(name = "_index")
     List<Integer> deliveredItemIndices;
 
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java
index 1eba0ffa7..97ba6a603 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/domain/Player.java
@@ -7,11 +7,10 @@ package com.mysema.query.jpa.domain;
 
 import java.util.List;
 
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.annotations.CollectionOfElements;
-
 /**
  * The Class Player.
  */
@@ -20,6 +19,6 @@ public class Player {
     @Id
     long id;
 
-    @CollectionOfElements
+    @ElementCollection
     List<Integer> scores;
 }
diff --git a/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java b/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
index ae11d8671..e1edbeba9 100644
--- a/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
+++ b/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerNotTokenizedTest.java
@@ -52,7 +52,7 @@ public class LuceneSerializerNotTokenizedTest {
     public void Before() throws Exception {
         serializer = new LuceneSerializer(false, false);
         idx = new RAMDirectory();
-        writer = new IndexWriter(idx, new StandardAnalyzer(Version.LUCENE_CURRENT), true, MaxFieldLength.UNLIMITED);
+        writer = new IndexWriter(idx, new StandardAnalyzer(Version.LUCENE_30), true, MaxFieldLength.UNLIMITED);
 
         writer.addDocument(createDocument(clooney));
         writer.addDocument(createDocument(pitt));
diff --git a/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java b/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java
index 580b72ec1..7c2fe0c8c 100644
--- a/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java
+++ b/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java
@@ -41,7 +41,6 @@ import com.mysema.query.types.Ops;
 import com.mysema.query.types.expr.BooleanExpression;
 import com.mysema.query.types.path.NumberPath;
 import com.mysema.query.types.path.PathBuilder;
-import com.mysema.query.types.path.SimplePath;
 import com.mysema.query.types.path.StringPath;
 
 /**
@@ -116,7 +115,7 @@ public class LuceneSerializerTest {
         floatField = entityPath.getNumber("floatField", Float.class);
 
         idx = new RAMDirectory();
-        writer = new IndexWriter(idx, new StandardAnalyzer(Version.LUCENE_CURRENT), true, MaxFieldLength.UNLIMITED);
+        writer = new IndexWriter(idx, new StandardAnalyzer(Version.LUCENE_30), true, MaxFieldLength.UNLIMITED);
 
         writer.addDocument(createDocument());
 
diff --git a/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
index 0b6ab0f4c..16f105eb5 100644
--- a/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
+++ b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
@@ -25,12 +25,10 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.document.NumericField;
 import org.apache.lucene.document.Field.Index;
 import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriter.MaxFieldLength;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Searcher;
-import org.apache.lucene.store.LockObtainFailedException;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.util.Version;
 import org.junit.After;