diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java
index 4144cbfa9f..7e59ce4cce 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableMapEntity.java
@@ -30,6 +30,7 @@ import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
 import javax.persistence.Table;
 
 import org.hibernate.envers.Audited;
@@ -48,6 +49,7 @@ public class EmbeddableMapEntity {
 	@Audited
 	@ElementCollection
 	@CollectionTable(name = "EmbMapEnt_map")
+	@MapKeyColumn(nullable = false) // NOT NULL for Sybase
 	private Map<String, Component3> componentMap;
 
 	public EmbeddableMapEntity() {
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java
index 359e028fd6..1afa11765a 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/ItemId.java
@@ -18,7 +18,7 @@ public class ItemId implements Serializable {
     private Integer version;
 
     @ManyToOne
-    @JoinColumn(name = "producer")
+    @JoinColumn(name = "producer", nullable = false) // NOT NULL for Sybase
     private Producer producer;
 
     public ItemId() {