diff --git a/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Account.hbm.xml b/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Account.hbm.xml
index 17360b6749..7b4055e2a7 100755
--- a/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Account.hbm.xml
+++ b/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Account.hbm.xml
@@ -8,7 +8,7 @@
     <class entity-name="Customer" node="customer">
         <id name="customerId" type="string" node="@id"/>
         <component name="name">
-            <property name="first" type="string"/>
+            <property name="first" column="`first`" type="string"/>
             <property name="last" type="string"/>
         </component>
         <property name="address" type="string" node="address"/>
@@ -34,7 +34,7 @@
         </set>
     </class>
 
-    <class entity-name="Account" node="account">
+    <class entity-name="Account" table="`Account`" node="account">
         <id name="accountId" type="string" node="@id"/>
         <many-to-one name="customer" column="customerId" entity-name="Customer" cascade="all" embed-xml="true" />
         <!--not-null="true"-->
diff --git a/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Employer.hbm.xml b/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Employer.hbm.xml
index a1ab5af0fd..8e4c555cdf 100755
--- a/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Employer.hbm.xml
+++ b/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Employer.hbm.xml
@@ -19,7 +19,7 @@
 		<id name="id" node="@id" type="long">
 			<generator class="increment"/>
 		</id>
-		<discriminator column="role" type="string" length="10"/>
+		<discriminator column="`role`" type="string" length="10"/>
 		<property name="name" node="@name" type="string"/>
 		<subclass entity-name="Techie" node="techie" />
 		<subclass entity-name="Salesdude" node="sales-dude"/>