diff --git a/build.gradle b/build.gradle
index 2bd41d3d3..e29b53c7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,6 +56,12 @@ allprojects {
 			url 'https://oss.sonatype.org/content/repositories/snapshots'
 		}
 	}
+
+	if (JavaVersion.current().isJava8Compatible()) {
+		tasks.withType(Javadoc) {
+			options.addStringOption('Xdoclint:none', '-quiet')
+		}
+	}
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
index 547ad4bdf..fbed0e58a 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
@@ -796,7 +796,10 @@ public class PacketParserUtilsTest {
         for (int i = 0; i < availableLocales.length; i++) {
             if (availableLocales[i] != Locale.getDefault()) {
                 otherLanguage = availableLocales[i].getLanguage().toLowerCase(Locale.US);
-                break;
+                // Check for empty strings as Java8 returns those here for certain Locales
+                if (otherLanguage.length() > 0) {
+                    break;
+                }
             }
         }
         return otherLanguage;