diff --git a/gradle/published-java-module.gradle b/gradle/published-java-module.gradle
index ac9043be27..d85d27f17d 100644
--- a/gradle/published-java-module.gradle
+++ b/gradle/published-java-module.gradle
@@ -25,7 +25,7 @@ jar {
 			classesDir = sourceSets.main.groovy.outputDir
 		}
 		else {
-			classesDir = sourceSets.main.output.classesDir
+			classesDir = sourceSets.main.java.outputDir
 		}
 		classpath = configurations.runtime
 
@@ -115,7 +115,7 @@ javadoc {
 
 		doFirst {
 			// ordering problems if we try to do this during config phase :(
-			classpath += project.sourceSets.main.output + project.sourceSets.main.compileClasspath + project.configurations.provided
+			classpath += project.sourceSets.main.output.classesDirs + project.sourceSets.main.compileClasspath + project.configurations.provided
 		}
 	}
 }
diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
index fbf1653354..53630d2233 100644
--- a/hibernate-osgi/hibernate-osgi.gradle
+++ b/hibernate-osgi/hibernate-osgi.gradle
@@ -44,8 +44,8 @@ sourceSets {
 	test {
 		// send javac output and resource copying to the same output directory for test
 		// so Pax Exam can more easily find it without explicit TinyBundle hooks
-		output.classesDir = "${buildDir}/classes/test"
-		output.resourcesDir = output.classesDir
+		java.outputDir = file( "${buildDir}/classes/test" )
+		output.resourcesDir = java.outputDir
 	}
 }
 
@@ -230,7 +230,7 @@ task generatePaxExamEnvironmentFile {
 		properties.setProperty( 'org.ops4j.pax.exam.container.karaf.distroUrl', karafDistroFile.toURI().toURL().toExternalForm() )
 		properties.setProperty( 'org.ops4j.pax.exam.container.karaf.unpackDir', karafUnpackDirectory.absolutePath )
 		properties.setProperty( 'org.ops4j.pax.exam.container.karaf.version', karafVersion as String )
-		properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.classesDir', sourceSets.test.output.classesDir.absolutePath )
+		properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.classesDir', sourceSets.test.java.outputDir.absolutePath )
 		properties.setProperty( 'org.ops4j.pax.exam.container.karaf.probe.resourcesDir', sourceSets.test.output.resourcesDir.absolutePath )
 		properties.setProperty( 'org.hibernate.osgi.test.karafFeatureFile', karaf.features.outputFile.absolutePath )