diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index 463bbf80e..22ab832d7 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -170,6 +170,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
diff --git a/openjpa-integration/jmx/pom.xml b/openjpa-integration/jmx/pom.xml
index 86e806f79..8c40e4b4f 100644
--- a/openjpa-integration/jmx/pom.xml
+++ b/openjpa-integration/jmx/pom.xml
@@ -61,8 +61,8 @@
     </dependency>
   </dependencies>
   
-  <build>
-      <plugins>
+    <build>
+        <plugins>
             <!-- Extract the common test support files from o-p-j-tests.jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -90,38 +90,41 @@
                 </executions>
             </plugin>
 
-        <plugin>
-          <!-- Use openjpa maven plugin to enhance the domain model classes -->
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>openjpa-maven-plugin</artifactId>
-          <configuration>
-            <includes>org/apache/openjpa/integration/jmx/*.class</includes>
-            <addDefaultConstructor>true</addDefaultConstructor>
-            <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
-            <!-- persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
-          </configuration>
-          <executions>
-            <execution>
-              <id>enhancer</id>
-              <phase>process-test-classes</phase>
-              <goals>
-                <goal>test-enhance</goal>
-              </goals>
-            </execution>
-          </executions>
-          <dependencies>
-            <dependency>
-              <groupId>org.apache.openjpa</groupId>
-              <artifactId>openjpa-all</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <!-- The surefire plugin is used to run the jUnit tests -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-        </plugin>
-      </plugins>
-  </build>
+            <plugin>
+                <!-- Use openjpa maven plugin to enhance the domain model classes -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>openjpa-maven-plugin</artifactId>
+                <configuration>
+                    <includes>org/apache/openjpa/integration/jmx/*.class</includes>
+                    <addDefaultConstructor>true</addDefaultConstructor>
+                    <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+                    <!-- persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>enhancer</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>test-enhance</goal>
+                       </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-all</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <!-- The surefire plugin is used to run the jUnit tests -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>${surefire.jvm.args}</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml
index 7dc86ea11..d5129cc18 100644
--- a/openjpa-integration/slf4j/pom.xml
+++ b/openjpa-integration/slf4j/pom.xml
@@ -137,6 +137,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 794562f41..337c81b69 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -194,7 +194,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>test-compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <tasks>                           
                                 <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 6ddcdf002..ac44f31e6 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -55,6 +55,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>${surefire.jvm.args}</argLine>
                     <includes>
                         <include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include>
                     </includes>
@@ -775,7 +776,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>test-compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <tasks>                           
                                 <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
@@ -798,6 +799,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!-- exclude classes that end with 'Test'; these 
                              are not test cases per OpenJPA standards -->
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 47af824a9..0ef0158dc 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -724,7 +724,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>test-compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <tasks>
                                 <ant antfile="src/test/ant/enhancer.xml" target="enhance" inheritRefs="true">
@@ -747,6 +747,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <argLine>${surefire.jvm.args}</argLine>
                     <excludes>
                         <!--
                             exclude classes that end with 'Test'; these are not test cases per OpenJPA standards
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index 1f079d5fa..f2a5c4c30 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -108,7 +108,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>test-compile</phase>
+                        <phase>process-test-classes</phase>
                         <configuration>
                             <tasks>
                                 <ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
diff --git a/pom.xml b/pom.xml
index 78d4a9c36..6ef6ac95a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -694,7 +694,7 @@
                         <argLine>${surefire.jvm.args}</argLine>
                         <useFile>false</useFile>
                         <trimStackTrace>false</trimStackTrace>
-                        <useSystemClassLoader>true</useSystemClassLoader>
+                        <useSystemClassLoader>false</useSystemClassLoader>
                     <systemProperties>
                         <property>
                             <name>openjpa.Log</name>
@@ -732,14 +732,6 @@
                             <name>derby.locks.waitTimeout</name>
                             <value>${derby.locks.waitTimeout}</value>
                         </property>
-                        <property>
-                            <name>derby.storage.pageCacheSize</name>
-                            <value>10000</value>
-                        </property>
-                        <property>
-                            <name>derby.storage.initialPages</name>
-                            <value>10</value>
-                        </property>
                         <property>
                             <name>openjpa.ConnectionProperties</name>
                             <value>${dbcp.args}</value>