diff --git a/docs/docs.gradle b/docs/docs.gradle
index e420c4abf3..4bd90af048 100644
--- a/docs/docs.gradle
+++ b/docs/docs.gradle
@@ -99,6 +99,11 @@ task apidocs(type: Javadoc) {
 	}
 }
 
+if (JavaVersion.current().isJava8Compatible()) {
+	// Turn off doclint in JDK 8 Javadoc (too strict on checks)
+	apidocs.options.addStringOption('Xdoclint:none', '-quiet')
+}
+
 ext.apiSpec = copySpec {
 	into('apidocs') {
 		from(apidocs.destinationDir)
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 1a3c4ac97c..435583f63e 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -219,6 +219,13 @@ javadoc {
 	}
 }
 
+if (JavaVersion.current().isJava8Compatible()) {
+	tasks.withType(Javadoc) {
+		// Turn off doclint in JDK 8 Javadoc (too strict on checks)
+		options.addStringOption('Xdoclint:none', '-quiet')
+	}
+}
+
 task javadocJar(type: Jar) {
 	classifier = 'javadoc'
 	from javadoc