diff --git a/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs b/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs
index 503e9a3945..b72f9c0735 100644
--- a/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs
+++ b/src/NHibernate.Test/NHSpecificTest/GH3530/Entities.cs
@@ -14,4 +14,13 @@ public class LocaleEntity
 		public virtual double DoubleValue { get; set; }
 		public virtual decimal DecimalValue { get; set; }
 	}
+
+	public class SchemaLocaleEntity
+	{
+		public virtual Guid Id { get; set }
+		public virtual string IntegerValue { get; set; }
+		public virtual string DateTimeValue { get; set; }
+		public virtual string DoubleValue { get; set; }
+		public virtual string DecimalValue { get; set; }
+	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml
index 1882105089..ba050dc1a2 100644
--- a/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml
+++ b/src/NHibernate.Test/NHSpecificTest/GH3530/Mappings.hbm.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
                    namespace="NHibernate.Test.NHSpecificTest.GH3530">
-  <class name="LocaleEntity">
+  <!-- The schema exporter should ignore this version but we should be able to map it to the version created below. -->
+  <class name="LocaleEntity" schema-action="none" table="LocaleEntity">
     <id name="Id" generator="guid.comb" />
     <property name="IntegerValue" column="IntegerValue"/>
     <property name="DateTimeValue" column="DateTimeValue"/>
     <property name="DoubleValue" column="DoubleValue"/>
+    <property name="DecimalValue" column="DecimalValue"/>
+  </class>
+  <!-- The schema exporter should export this version of the entity and generate text columns for all types. -->
+  <class name="SchemaLocaleEntity" table="LocaleEntity">
+    <id name="Id" generator="guid.comb" />
+    <property name="IntegerValue" column="IntegerValue"/>
+    <property name="DateTimeValue" column="DateTimeValue"/>
+    <property name="DoubleValue" column="DoubleValue"/>
+    <property name="DecimalValue" column="DecimalValue"/>
   </class>
 </hibernate-mapping>