diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 1c31c4c60..dcb60174e 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -552,7 +552,7 @@
                             <value>DefaultLevel=${openjpa.loglevel}</value>
                         </property>
                         <property>
-                            <name>javax.persistence.jdbc.driver</name>
+                            <name>openjpa.ConnectionDriverName</name>
                             <value>org.apache.commons.dbcp.BasicDataSource</value>
                         </property>
                         <property>
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
index 2eb3efd40..b40f614a6 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestBadJdbcUrl.java
@@ -59,7 +59,7 @@ public class TestBadJdbcUrl extends TestCase {
 	 */
 	public void testBadUrlProtocolValueWithValidDriverClass() {
 		Properties p = new Properties();
-		p.put("javax.persistence.jdbc.driver", GOOD_DRIVER);
+		p.put("openjpa.ConnectionDriverName", GOOD_DRIVER);
 		p.put("openjpa.ConnectionURL", BAD_URL_PROTOCOL);
 		verifyConnectException(p, PersistenceException.class,
 				UserException.class, GOOD_DRIVER, BAD_URL_PROTOCOL);
@@ -70,7 +70,7 @@ public class TestBadJdbcUrl extends TestCase {
 	 */
 	public void testBadUrlProtocolValueWithValidDataSource() {
 		Properties p = new Properties();
-		p.put("javax.persistence.jdbc.driver", GOOD_DATASOURCE);
+		p.put("openjpa.ConnectionDriverName", GOOD_DATASOURCE);
 		p.put("openjpa.ConnectionURL", BAD_URL_PROTOCOL);
 		p.put("openjpa.ConnectionProperties", BAD_CONN_PROPS);
 		verifyConnectException(p, PersistenceException.class,
@@ -82,7 +82,7 @@ public class TestBadJdbcUrl extends TestCase {
 	 */
 	public void testBadUrlSubprotocolValueWithValidDriverClass() {
 		Properties p = new Properties();
-		p.put("javax.persistence.jdbc.driver", GOOD_DRIVER);
+		p.put("openjpa.ConnectionDriverName", GOOD_DRIVER);
 		p.put("openjpa.ConnectionURL", BAD_URL_SUBPROTOCOL);
 		verifyConnectException(p, PersistenceException.class,
 				UserException.class, GOOD_DRIVER, BAD_URL_SUBPROTOCOL);
@@ -93,7 +93,7 @@ public class TestBadJdbcUrl extends TestCase {
 	 */
 	public void testBadUrlSubprotocolValueWithValidDataSource() {
 		Properties p = new Properties();
-		p.put("javax.persistence.jdbc.driver", GOOD_DRIVER);
+		p.put("openjpa.ConnectionDriverName", GOOD_DRIVER);
 		p.put("openjpa.ConnectionURL", BAD_URL_SUBPROTOCOL);
 		verifyConnectException(p, PersistenceException.class,
 				UserException.class, GOOD_DRIVER, BAD_URL_SUBPROTOCOL);
@@ -104,7 +104,7 @@ public class TestBadJdbcUrl extends TestCase {
 	 */
 	public void testValidUrlWithInvalidDriver() {
 		Properties p = new Properties();
-		p.put("javax.persistence.jdbc.driver", BAD_DRIVER);
+		p.put("openjpa.ConnectionDriverName", BAD_DRIVER);
 		p.put("openjpa.ConnectionURL", GOOD_URL);
 		verifyConnectException(p, PersistenceException.class,
 				UserException.class, GOOD_URL, BAD_DRIVER);
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
index a2915091b..c98f62ca1 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPropertiesMethods.java
@@ -64,7 +64,7 @@ public class TestPropertiesMethods extends SingleEMFTestCase {
         // openjpa.ConnectionProperties. If either one of these are changed,
         // this test case may fail.
         String javaxConnectionDriver =
-            (String) emProperties.get("javax.persistence.jdbc.driver");
+            (String) emProperties.get("openjpa.ConnectionDriverName");
         assertNotNull(javaxConnectionDriver);
         String openjpaConnectionURL =
             (String) emProperties.get("openjpa.ConnectionURL");
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
index 90c282870..71459bb1d 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
@@ -71,7 +71,7 @@
 
     <persistence-unit name="invalid">
         <properties>
-            <property name="javax.persistence.jdbc.driver"
+            <property name="openjpa.ConnectionDriverName"
                 value="org.apache.commons.dbcp.BasicDataSource" />
             <property name="openjpa.ConnectionProperties"
                 value="DriverClassName=not.a.real.Driver,Url=jdbc:notreal://"/>