Index: jpa/eclipselink.jpa.test/build.xml
===================================================================
--- jpa/eclipselink.jpa.test/build.xml	(revision 5174)
+++ jpa/eclipselink.jpa.test/build.xml	(working copy)
@@ -111,6 +111,14 @@
         <contains string="${db.driver}" substring="oracle"/>
     </condition>
 
+    <!-- This checks if the environment is ready for proxy authentication tests -->
+    <condition property="is.ready.for.proxy.authentication">
+        <and>
+            <isset property="is.oracle"/>
+            <contains string="${oracle.proxy.authentication.is.setup}" substring="true"/>
+        </and>
+    </condition>
+
     <!-- This checks if the Apllication Server is WebSphere -->
     <condition property="is.websphere">
         <contains string="${server.name}" substring="websphere"/>
@@ -683,10 +691,11 @@
             <param name="RUN_PATH" value="run.classpath"/>
             <param name="DB_URL" value="${db.url}"/>
         </antcall>
+        <antcall target="test-oracle-proxy" inheritRefs="true"/>
     </target>
 
-    <!-- Runs JPA Oracle-specific tests. -->
-    <target name="test-oracle-proxy" if="is.oracle" depends="clean-test, config-trunk, config-flat">
+    <!-- Oracle proxy authentication needs to be setup for the tests. -->
+    <target name="test-oracle-proxy" if="is.ready.for.proxy.authentication" depends="clean-test, config-trunk, config-flat">
         <antcall target="run-test" inheritRefs="true">
             <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.proxyauthentication.ProxyAuthenticationServerTestSuite"/>
             <param name="TEST_AGENT" value="${test.agent}"/>
@@ -939,6 +948,7 @@
         </condition>
 
         <junit printsummary="yes" haltonfailure="yes" fork="yes" showoutput="true" maxmemory="512m" dir="${eclipselink.jpa.test}/${run.dir}">
+            <sysproperty key="proxy.user.name" value="${oracle.proxy.user}"/>
             <jvmarg value="${TEST_AGENT}"/>
             <jvmarg value="${TEST_WEAVING}"/>
             <jvmarg value="${ORM_TESTING}"/>
@@ -1414,7 +1424,7 @@
         <echo>Running test ${EAR_NAME} on ${server.name}</echo>
         <mkdir dir="${eclipselink.jpa.test}/${report.dir}"/>
         <junit printsummary="yes" haltonfailure="yes" failureproperty="junit.failed" fork="yes" showoutput="true" maxmemory="256m" dir="${run.dir}">
-            <sysproperty key="proxy.user.name" value="${proxy.user.name}"/>
+            <sysproperty key="proxy.user.name" value="${oracle.proxy.user}"/>
             <sysproperty key="server.platform" value="${server.platform}"/>
             <sysproperty key="server.user" value="${server.user}"/>
             <sysproperty key="server.password" value="${server.pwd}"/>
@@ -1511,13 +1521,11 @@
         <antcall target="server-test-validation" inheritRefs="true"/>
         <antcall target="server-test-xml-mergeinherited" inheritRefs="true"/>
         <antcall target="server-test-xmltest" inheritRefs="true"/>
+        <!-- The following models are oracle specific -->
         <antcall target="server-test-oracle-timestamptz" inheritRefs="true"/>
         <antcall target="server-test-custom-features" inheritRefs="true"/>
         <antcall target="server-test-struct-converter" inheritRefs="true"/>
-        <antcall target="generate-servertest-report" inheritRefs="true"/>
-    </target>
-
-    <target name="server-test-oracle-proxy" depends="clean-test">
+        <!-- Oracle proxy authentication needs to be setup properly for the following model -->
         <antcall target="server-test-proxy-authentication" inheritRefs="true"/>
         <antcall target="generate-servertest-report" inheritRefs="true"/>
     </target>
@@ -1846,7 +1854,7 @@
         </antcall>
     </target>
 
-    <target name="server-test-custom-features" if="run.jpa.customfeatures.model">
+    <target name="server-test-custom-features" if="run.jpa.customfeatures.model" if="is.oracle">
         <antcall target="server-run-all" inheritRefs="true">
             <param name="PERSISTENCE_UNIT_NAME" value="customfeatures"/>
             <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/customfeatures"/>
@@ -1884,7 +1892,7 @@
         </antcall>
     </target>
 
-    <target name="server-test-proxy-authentication" if="is.oracle">
+    <target name="server-test-proxy-authentication" if="is.ready.for.proxy.authentication">
         <antcall target="server-run-all" inheritRefs="true">
             <param name="PERSISTENCE_UNIT_NAME" value="proxyauthentication"/>
             <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/proxyauthentication"/>
Index: jpa/eclipselink.jpa.test/test.properties
===================================================================
--- jpa/eclipselink.jpa.test/test.properties	(revision 5174)
+++ jpa/eclipselink.jpa.test/test.properties	(working copy)
@@ -64,6 +64,9 @@
 # db.user=scott
 # db.pwd=tiger
 # db.platform=org.eclipse.persistence.platform.database.OraclePlatform
+## Oracle proxy authentication needs to be setup to run proxy authentication tests
+# oracle.proxy.user=PAS_PROXY
+# oracle.proxy.authentication.is.setup=false
 
 ## MySQL
 # jdbc.driver.jar=${extensions.depend.dir}/mysql-connector-java-5.0.7-bin.jar