diff --git a/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java b/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
index 9b45bb488..518f5eca7 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/AbstractJPATest.java
@@ -17,6 +17,7 @@ import static com.mysema.query.Target.DERBY;
 import static com.mysema.query.Target.HSQLDB;
 import static com.mysema.query.Target.MYSQL;
 import static com.mysema.query.Target.ORACLE;
+import static com.mysema.query.Target.TERADATA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -797,7 +798,7 @@ public abstract class AbstractJPATest {
 
     @Test
     @NoEclipseLink
-    @ExcludeIn(ORACLE)
+    @ExcludeIn({ORACLE, TERADATA})
     public void JoinEmbeddable() {
         QBookVersion bookVersion = QBookVersion.bookVersion;
         QBookMark bookMark = QBookMark.bookMark;
@@ -1145,7 +1146,7 @@ public abstract class AbstractJPATest {
     }
 
     @Test
-    @ExcludeIn(MYSQL)
+    @ExcludeIn({MYSQL, TERADATA})
     @NoOpenJPA
     public void StringOperations() {
         // NOTE : locate in MYSQL is case-insensitive
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 6f63a11e3..cb88c8701 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
@@ -1,6 +1,6 @@
 /*
  * Copyright 2011, Mysema Ltd
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -19,6 +19,7 @@ import java.util.Map;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -34,6 +35,7 @@ import javax.persistence.TemporalType;
 public class Calendar implements Serializable{
     @ElementCollection
     @Temporal(TemporalType.DATE)
+    @MapKeyColumn(name="holidays_key")
     Map<String, java.util.Date> holidays;
 
     @Id