diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index acaef7e3d..458905778 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -806,10 +806,10 @@
                         <exclude>org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java</exclude>
                         <!-- TestPMMemory creates heapdumps etc and there's no real asserts within the test.  -->
                         <exclude>org/apache/openjpa/persistence/kernel/TestPMMemory.java</exclude>
-                        <!-- You can exclude the lockmgr test to save ~15 mins.
-                        <exclude>org/apache/openjpa/persistence/lockmgr/*.java</exclude>
-                        -->
-						<!-- ================================================================== -->
+                        <!-- You can exclude the lockmgr test to save ~15 mins. -->
+                        <!-- <exclude>org/apache/openjpa/persistence/lockmgr/*.java</exclude> -->
+						
+                        <!-- ================================================================== -->
 						<!--  Critera & MetaModel tests are *temporarily* excluded to wait for  -->
 						<!--  spec to stabilize on Result Processing API                        -->
 						<!-- ================================================================== --> 
@@ -829,6 +829,10 @@
                             <name>openjpa.Log</name>
                             <value>DefaultLevel=${openjpa.loglevel}</value>
                         </property>
+                        <property>
+                            <name>openjpa.DynamicEnhancementAgent</name>
+                            <value>false</value>
+                        </property>
                         <property>
                             <name>openjpa.ConnectionDriverName</name>
                             <value>org.apache.commons.dbcp.BasicDataSource</value>