diff --git a/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java b/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
index 1189086d0..0ba65899b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
+++ b/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
@@ -14,7 +14,6 @@
 package com.mysema.query;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java b/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java
index 66feca9bb..9d58a589c 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/QueryPerformanceTest.java
@@ -26,7 +26,7 @@ public class QueryPerformanceTest {
     
     @BeforeClass
     public static void setUpClass() {
-        Mode.mode.set("h2");
+        Mode.mode.set("h2-perf");
         Mode.target.set(Target.H2);
     }
     
@@ -45,51 +45,50 @@ public class QueryPerformanceTest {
     }
     
     @Test
-    public void test() {
-        Map<String, Long> results = new LinkedHashMap<String, Long>();
-        
-        // by id - raw
+    public void ById_Raw() {
         long start = System.currentTimeMillis();
         for (int i = 0; i < iterations; i++) {
             Cat cat = (Cat)entityManager.createQuery("select cat from Cat cat where id = ?")
                 .setParameter(1, i + 100).getSingleResult();
             assertNotNull(cat);            
         }
-        results.put("by id - raw", System.currentTimeMillis() - start);
-        
-        // by - dsl
-        start = System.currentTimeMillis();
+        System.err.println("by id - raw" + (System.currentTimeMillis() - start));
+    }
+    
+    @Test
+    public void ById_Qdsl() {
+        long start = System.currentTimeMillis();
         for (int i = 0; i < iterations; i++) {
             QCat cat = QCat.cat;
             Cat c = query().from(cat).where(cat.id.eq(i+100)).uniqueResult(cat);
             assertNotNull(c);
         }
-        results.put("by id - dsl", System.currentTimeMillis() - start);
-        
-        // by id - raw
-        start = System.currentTimeMillis();
+        System.err.println("by id - dsl" + (System.currentTimeMillis() - start));
+    }
+    
+    @Test
+    public void ById_TwoCols_Raw() {
+        long start = System.currentTimeMillis();
         for (int i = 0; i < iterations; i++) {
             Object[] row = (Object[])entityManager.createQuery("select cat.id, cat.name from Cat cat where id = ?")
                 .setParameter(1, i + 100).getSingleResult();
             assertNotNull(row);            
         }
-        results.put("by id - 2 cols - raw", System.currentTimeMillis() - start);
-        
-        // by id - dsl
-        start = System.currentTimeMillis();
+        System.err.println("by id - 2 cols - raw" + (System.currentTimeMillis() - start));
+    }
+    
+    @Test
+    public void ById_TwoCols_Qdsl() {
+        long start = System.currentTimeMillis();
         for (int i = 0; i < iterations; i++) {
             QCat cat = QCat.cat;
             Tuple row = query().from(cat).where(cat.id.eq(i+100)).uniqueResult(cat.id, cat.name);
             assertNotNull(row);
         }
-        results.put("by id - 2 cols - dsl", System.currentTimeMillis() - start);
-        
-        
-        for (Map.Entry<String, Long> entry : results.entrySet()) {
-            System.err.println(entry.getKey() + " " + entry.getValue());
-        }
+        System.err.println("by id - 2 cols - dsl" + (System.currentTimeMillis() - start));
     }
     
+    
     public void setEntityManager(EntityManager entityManager) {
         this.entityManager = entityManager;
     }
diff --git a/querydsl-jpa/src/test/resources/META-INF/persistence.xml b/querydsl-jpa/src/test/resources/META-INF/persistence.xml
index bb1b61cfd..45003b473 100644
--- a/querydsl-jpa/src/test/resources/META-INF/persistence.xml
+++ b/querydsl-jpa/src/test/resources/META-INF/persistence.xml
@@ -83,6 +83,20 @@
             <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
             <property name="hibernate.connection.url" value="jdbc:h2:target/h2-1" />
             <property name="hibernate.connection.user" value="sa" />
+            <property name="hibernate.show_sql" value="true"/>
+            <property name="hibernate.flushMode" value="FLUSH_AUTO" />
+            <property name="hibernate.hbm2ddl.auto" value="update" />
+        </properties>
+    </persistence-unit>
+    
+        <persistence-unit name="h2-perf" transaction-type="RESOURCE_LOCAL">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <properties>
+            <property name="hibernate.archive.autodetection" value="class" />
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+            <property name="hibernate.connection.driver_class" value="org.h2.Driver" />
+            <property name="hibernate.connection.url" value="jdbc:h2:target/h2-perf" />
+            <property name="hibernate.connection.user" value="sa" />
             <!-- 
             <property name="hibernate.show_sql" value="true"/>
              -->