diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 847d478d2..b9dc596ea 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -208,7 +208,8 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${pom.version}</version>
-            <classifier>tests</classifier>
+            <!-- <classifier>tests</classifier> -->
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index f95151bd7..687aa9fc4 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -694,7 +694,8 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${pom.version}</version>
-            <classifier>test-base</classifier>
+            <!-- <classifier>test-base</classifier> -->
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 390e8a6bb..8ec56f4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,8 +249,6 @@
                         <artifactId>maven-release-plugin</artifactId>
                         <configuration>
                             <useReleaseProfile>false</useReleaseProfile>
-                            <!-- work-around for MJAR-68 -->
-                            <preparationGoals>clean install</preparationGoals>
                             <goals>deploy site site-deploy</goals>
                             <arguments>-Prelease,docbook-profile</arguments>
                             <autoVersionSubmodules>true</autoVersionSubmodules>