diff --git a/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs b/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs
index 503e9a3945..0fe3ac2b0b 100644
--- a/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs
+++ b/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs
@@ -8,7 +8,7 @@ namespace NHibernate.Test.NHSpecificTest.GH3530
 {
 	public class LocaleEntity
 	{
-		public virtual Guid Id { get; set; }
+		public virtual int Id { get; set; }
 		public virtual int IntegerValue { get; set; }
 		public virtual DateTime DateTimeValue { get; set; }
 		public virtual double DoubleValue { get; set; }
diff --git a/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml
index 1882105089..e5047f4fd5 100644
--- a/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml
+++ b/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml
@@ -2,9 +2,10 @@
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
                    namespace="NHibernate.Test.NHSpecificTest.GH3530">
   <class name="LocaleEntity">
-    <id name="Id" generator="guid.comb" />
+    <id name="Id" generator="identity" />
     <property name="IntegerValue" column="IntegerValue"/>
     <property name="DateTimeValue" column="DateTimeValue"/>
     <property name="DoubleValue" column="DoubleValue"/>
+    <property name="DecimalValue" column="DecimalValue"/>
   </class>
 </hibernate-mapping>