diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml
index 5e2b0d6f6f..e5f75d9a80 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/basic/Person.hbm.xml
@@ -25,7 +25,7 @@
             <generator class="hilo"/>
         </id>
         <property name="name" length="100"/>
-        <property name="userId" column="person_userid" length="8" unique="true"/>
+        <property name="userId" column="person_userid" length="8" unique="true" not-null="true"/>
         <one-to-one name="address" property-ref="person" cascade="all" fetch="join"/>
         <set name="accounts" inverse="true">
             <key column="userId" property-ref="userId"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
index 8b7468c187..74b8ddda73 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/complete/Mapping.hbm.xml
@@ -16,7 +16,7 @@
 		</id>
 		<component name="identity" class="Identity">
 			<property name="name"/>
-			<property name="ssn" unique="true"/>
+			<property name="ssn" unique="true" not-null="true"/>
 		</component>
 	</class>
 	
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
index 004ebf4fb6..a2599d9825 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/component/partial/Mapping.hbm.xml
@@ -16,7 +16,7 @@
 		</id>
 		<component name="identity">
 			<property name="name"/>
-			<property name="ssn" unique="true"/>
+			<property name="ssn" unique="true" not-null="true"/>
 		</component>
 	</class>
 	
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
index 98fee61092..290d2c4c5f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/Person.hbm.xml
@@ -11,10 +11,10 @@
 		</id>
 		<discriminator formula="customerId"/>
 		<property name="name" length="100"/>
-		<property name="personId" length="8" unique="true"/>
+		<property name="personId" length="8" unique="true" not-null="true"/>
 				
 		<subclass name="Customer" discriminator-value="not null">
-			<property name="customerId" length="8" unique="true"/>
+			<property name="customerId" length="8" unique="true" not-null="true"/>
 		</subclass>
 	</class>
 	
@@ -22,8 +22,8 @@
 		<id name="accountId" length="32">
 			<generator class="uuid.hex"/>
 		</id>
-		<many-to-one name="person" column="personId" unique="true" property-ref="personId"/>
-		<many-to-one name="customer" column="customerPersonId" unique="true" property-ref="personId"/>
+		<many-to-one name="person" column="personId" unique="true" not-null="true" property-ref="personId"/>
+		<many-to-one name="customer" column="customerPersonId" unique="true" not-null="true" property-ref="personId"/>
 		<property name="type" column="`type`" not-null="true"/>
 	</class>
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
index 2df1413f32..54046df9cb 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/propertyref/inheritence/union/Person.hbm.xml
@@ -10,10 +10,10 @@
 			<generator class="hilo"/>
 		</id>
 		<property name="name" length="100"/>
-		<property name="personId" length="8" unique="true"/>
+		<property name="personId" length="8" unique="true" not-null="true"/>
 				
 		<union-subclass name="Customer" table="U_SBCLS_PROPREF_CUST">
-            <property name="customerId" length="8" unique="true"/>
+            <property name="customerId" length="8" unique="true" not-null="true"/>
 		</union-subclass>
 	</class>
 	
@@ -21,8 +21,8 @@
 		<id name="accountId" length="32">
 			<generator class="uuid.hex"/>
 		</id>
-		<many-to-one name="person" column="personId" unique="true" property-ref="personId"/>
-		<many-to-one name="customer" column="customerPersonId" unique="true" property-ref="personId"/>
+		<many-to-one name="person" column="personId" unique="true" not-null="true" property-ref="personId"/>
+		<many-to-one name="customer" column="customerPersonId" unique="true" not-null="true" property-ref="personId"/>
 		<property name="type" column="`type`" not-null="true"/>
 	</class>
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
index 87e09522ac..0adee42df3 100755
--- a/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
@@ -25,7 +25,7 @@
         <id name="id">
             <generator class="increment"/>
         </id>
-        <property name="name" unique="true"/>
+        <property name="name" unique="true" not-null="true"/>
     </class>
 
     <class name="Info">
diff --git a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
index 2dfaa137f6..9b19b550fd 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/subclassfilter/union-subclass.hbm.xml
@@ -11,7 +11,7 @@
 			<generator class="hilo"/>
 		</id>
 
-		<property name="name" unique="true"/>
+		<property name="name" unique="true" not-null="true"/>
 		<property name="company"/>
 		<property name="region"/>
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml
index 994765a301..4dca4f9d8d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/version/db/User.hbm.xml
@@ -17,7 +17,7 @@
         </id>
         <timestamp name="timestamp" column="ts" source="db"/>
         <!--<version name="timestamp" column="ts" type="org.hibernate.type.DbTimestampType"/>-->
-        <property name="username" column="user_name" type="string" unique="true"/>
+        <property name="username" column="user_name" type="string" unique="true" not-null="true"/>
         <set name="groups" table="db_vers_user_group" batch-size="9" inverse="true" optimistic-lock="true" lazy="true" cascade="none" >
             <key column="user_id"/>
             <many-to-many column="group_id" class="Group" lazy="false" fetch="join" />
@@ -34,7 +34,7 @@
         </id>
         <timestamp name="timestamp" column="ts" source="db"/>
         <!--<version name="timestamp" column="ts" type="org.hibernate.type.DbTimestampType"/>-->
-        <property name="name" column="name" type="string" unique="true"/>
+        <property name="name" column="name" type="string" unique="true" not-null="true"/>
         <set name="users" table="db_vers_user_group" batch-size="9" inverse="false" lazy="true" cascade="none" >
             <key column="group_id"/>
             <many-to-many column="user_id" class="User" lazy="false" fetch="join" />
@@ -47,7 +47,7 @@
         </id>
         <timestamp name="timestamp" column="ts" source="db"/>
         <!--<version name="timestamp" column="ts" type="org.hibernate.type.DbTimestampType"/>-->
-        <property name="name" column="name" type="string" unique="true"/>
+        <property name="name" column="name" type="string" unique="true" not-null="true"/>
         <property name="context" column="ctx" type="string"/>
         <property name="access" column="priv" type="string"/>
 	</class>