diff --git a/.travis.yml b/.travis.yml
index f74c88740..1abdffa1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: android
 android:
   components:
-    - android-16
+    - android-19
 jdk:
   - oraclejdk8
   - openjdk8
@@ -11,7 +11,7 @@ cache:
   - $HOME/.m2
 
 before_install:
-  - export GRADLE_VERSION=5.1.1
+  - export GRADLE_VERSION=5.2.1
   - wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-all.zip
   - unzip -q gradle-${GRADLE_VERSION}-all.zip
   - export PATH="$(pwd)/gradle-${GRADLE_VERSION}/bin:$PATH"
diff --git a/build.gradle b/build.gradle
index 5c997dcbb..8645b5368 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
 }
 
 plugins {
-    id 'ru.vyarus.animalsniffer' version '1.4.6'
-	id 'net.ltgt.errorprone' version '0.6'
+    id 'ru.vyarus.animalsniffer' version '1.5.0'
+	id 'net.ltgt.errorprone' version '0.8'
 }
 
 apply plugin: 'org.kordamp.gradle.markdown'
@@ -24,6 +24,7 @@ apply from: 'version.gradle'
 
 allprojects {
 	apply plugin: 'java'
+	apply plugin: 'java-library'
 	apply plugin: 'eclipse'
 	apply plugin: 'idea'
 	apply plugin: 'jacoco'
@@ -80,6 +81,8 @@ allprojects {
 			':smack-omemo',
 			':smack-omemo-signal',
 			':smack-openpgp',
+			':smack-xmlparser',
+			':smack-xmlparser-xpp3',
 		].collect{ project(it) }
 		androidBootClasspathProjects = [
 			':smack-android',
@@ -97,13 +100,37 @@ allprojects {
 			':smack-omemo-signal',
 			':smack-omemo-signal-integration-test',
 		].collect{ project(it) }
+		// When this list is empty, then move the according javadoc
+		// tool Werror option into the global configure section.
+		nonStrictJavadocProjects = [
+			':smack-bosh',
+			':smack-core',
+			':smack-experimental',
+			':smack-extensions',
+			':smack-im',
+			':smack-integration-test',
+			':smack-jingle-old',
+			':smack-legacy',
+			':smack-omemo',
+			':smack-tcp',
+		].collect{ project(it) }
 		// Lazily evaluate the Android bootClasspath and offline
 		// Javadoc using a closure, so that targets which do not
 		// require it are still able to succeed without an Android
 		// SDK.
 		androidBootClasspath = { getAndroidRuntimeJar() }
 		androidJavadocOffline = { getAndroidJavadocOffline() }
-		junitVersion = '5.2.0'
+		junit4Projects = [
+			':smack-core',
+			':smack-extensions',
+			':smack-im',
+			':smack-integration-test',
+			':smack-omemo',
+			':smack-omemo-signal',
+			':smack-openpgp',
+		].collect { project(it) }
+		junitVersion = '5.4.2'
+		powerMockVersion = '2.0.2'
 	}
 	group = 'org.igniterealtime.smack'
 	sourceCompatibility = JavaVersion.VERSION_1_8
@@ -114,6 +141,10 @@ allprojects {
 	}
 
 	test {
+		useJUnitPlatform()
+
+		maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+
 		// Enable full stacktraces of failed tests. Especially handy
 		// for environments like Travis.
 		testLogging {
@@ -170,21 +201,25 @@ allprojects {
 			'-Xlint:-options',
 			'-Werror',
 		]
-		options.errorprone.errorproneArgs = [
-			// Disable errorprone checks
-			'-Xep:TypeParameterUnusedInFormals:OFF',
-			// Disable errorpone StringSplitter check, as it
-			// recommends using Splitter from Guava, which we don't
-			// have (nor want to use in Smack).
-			'-Xep:StringSplitter:OFF',
-			'-Xep:JdkObsolete:OFF',
-			// Disabled because sinttest re-uses BeforeClass from junit.
-			// TODO: change sinttest so that it has it's own
-			// BeforeClass and re-enable this check.
-			'-Xep:JUnit4ClassAnnotationNonStatic:OFF',
-			// Disabled but should be re-enabled at some point
-			//'-Xep:InconsistentCapitalization:OFF',
-		]
+		options.errorprone {
+			error("UnusedVariable", "UnusedMethod")
+			errorproneArgs = [
+				// Disable errorprone checks
+				'-Xep:TypeParameterUnusedInFormals:OFF',
+				// Disable errorpone StringSplitter check, as it
+				// recommends using Splitter from Guava, which we don't
+				// have (nor want to use in Smack).
+				'-Xep:StringSplitter:OFF',
+				'-Xep:JdkObsolete:OFF',
+				// Disabled because sinttest re-uses BeforeClass from junit.
+				// TODO: change sinttest so that it has it's own
+				// BeforeClass and re-enable this check.
+				'-Xep:JUnit4ClassAnnotationNonStatic:OFF',
+				// Disabled but should be re-enabled at some point
+				//'-Xep:InconsistentCapitalization:OFF',
+				'-Xep:MixedMutabilityReturnType:OFF',
+			]
+		}
 	}
 
 	tasks.withType(ScalaCompile) {
@@ -232,7 +267,11 @@ allprojects {
 	}
 
 	dependencies {
-		errorprone 'com.google.errorprone:error_prone_core:2.3.2'
+		testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+		testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
+		testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
+
+		errorprone 'com.google.errorprone:error_prone_core:2.3.3'
 		errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
 	}
 
@@ -241,6 +280,15 @@ allprojects {
 	test { dependsOn javadoc }
 }
 
+configure (junit4Projects) {
+	dependencies {
+		testImplementation "org.junit.vintage:junit-vintage-engine:$junitVersion"
+		testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
+		testImplementation "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
+		testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
+	}
+}
+
 gradle.taskGraph.whenReady { taskGraph ->
 	if (signingRequired
 		&& taskGraph.allTasks.any { it instanceof Sign }) {
@@ -519,19 +567,21 @@ configure(integrationTestProjects + project(':smack-repl')) {
 project(':smack-omemo').clirr.enabled = false
 project(':smack-omemo-signal').clirr.enabled = false
 
-configure(
-	[ ':smack-omemo',
-	  ':smack-omemo-signal',
-	  ':smack-omemo-signal-integration-test',
-	].collect{ project(it) }) {
-}
-
 subprojects*.jar {
    manifest {
        from sharedManifest
    }
 }
 
+configure(subprojects - nonStrictJavadocProjects) {
+	tasks.withType(Javadoc) {
+		// Abort on javadoc warnings.
+		// See JDK-8200363 (https://bugs.openjdk.java.net/browse/JDK-8200363)
+		// for information about the -Xwerror option.
+		options.addStringOption('Xwerror', '-quiet')
+	}
+}
+
 configure(subprojects - gplLicensedProjects) {
 	checkstyle {
 		configProperties.checkstyleLicenseHeader = "header"
@@ -646,15 +696,7 @@ def getGitCommit() {
 }
 
 def getAndroidRuntimeJar() {
-	// We set a different Android API level compared to
-	// smackMinAndroidSdk here. The runtime jar retrieved via this
-	// method is, compared to earlier Smack versions, not used to
-	// check for Android API compatibility. Instead it is used to for
-	// the eclipse classpath, for javadoc and when compiling the pure
-	// Android subprojects of Smack. Currently we require level 16
-	// here, because of the @TargetApi annotation found in
-	// AndroidUsingLinkProperties of minidns-android21.
-	def androidApiLevel = 16
+	def androidApiLevel = ext.smackMinAndroidSdk
 	def androidHome = getAndroidHome()
 	def androidJar = new File("$androidHome/platforms/android-${androidApiLevel}/android.jar")
 	if (androidJar.isFile()) {
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index d925f4909..8d539f725 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -39,12 +39,7 @@
 		<property name="format" value="^\s+$"/>
 		<property name="message" value="Line containing only whitespace character(s)"/>
 	</module>
-	<module name="RegexpSingleline">
-		<!-- We use {2,} instead of + here to address the typical case where a file was written
-		   with tabs but javadoc is causing '\t *' -->
-		<property name="format" value="^\t+ {2,}"/>
-		<property name="message" value="Line containing space(s) after tab(s)"/>
-	</module>
+	<module name="FileTabCharacter"/>
 	<module name="RegexpSingleline">
 		<!--
 			Explaining the following Regex
@@ -147,6 +142,7 @@
 										 , LITERAL_DO
 										 , LITERAL_FOR
 										 , DO_WHILE
+										 , COMMA
 										 "/>
 		</module>
 		<module name="WhitespaceAround">
diff --git a/documentation/developer/provider.md b/documentation/developer/provider.md
index cd5255af5..465caeb32 100644
--- a/documentation/developer/provider.md
+++ b/documentation/developer/provider.md
@@ -27,11 +27,11 @@ public MyExtension parse(XmlPullParser parser, int initialDepth) {
   outerloop: while(true) {
     // Make sure to have already parse all attributes of the outermost element,
     // i.e. 'attrFoo' of 'myExtension' in this example. Then advance the parser
-    int event = parser.next();
+    XmlPullParser.Event event = parser.next();
 
     // Use switch/case of int instead of a if/else-if cascade
     switch (event) {
-    case XmlPullParser.START_TAG:
+    case START_ELEMENT:
       // Determine the name of the element which start tag we are seeing
       String name = parser.getName();
       // We can use switch/case of Strings since Java7, make use of its advantages
@@ -52,12 +52,15 @@ public MyExtension parse(XmlPullParser parser, int initialDepth) {
         break;
       }
       break;
-    case XmlPullParser.END_TAG:
+    case END_ELEMENT:
       // The abort condition with the break labeled loop statement
       if (parser.getDepth() == initialDepth) {
         break outerloop;
       }
       break;
+    default:
+      // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+      break;
     }
   }
 
diff --git a/documentation/extensions/index.md b/documentation/extensions/index.md
index 44739287b..527c0dd10 100644
--- a/documentation/extensions/index.md
+++ b/documentation/extensions/index.md
@@ -56,23 +56,25 @@ Smack Extensions and currently supported XEPs of smack-extensions
 | [SI File Transfer](filetransfer.md)         | [XEP-0096](https://xmpp.org/extensions/xep-0096.html)  | n/a       | Transfer files between two users over XMPP. |
 | User Mood                                   | [XEP-0107](https://xmpp.org/extensions/xep-0107.html)  | 1.2.1     | Communicate the users current mood. |
 | [Entity Capabilities](caps.md)              | [XEP-0115](https://xmpp.org/extensions/xep-0115.html)  | n/a       | Broadcasting and dynamic discovery of entity capabilities. |
-| [Jingle](jingle.html)                       | [XEP-0116](https://xmpp.org/extensions/xep-0166.html)  | n/a       | Initiate and manage sessions between two XMPP entities. |
 | Data Forms Validation                       | [XEP-0122](https://xmpp.org/extensions/xep-0122.html)  | n/a       | Enables an application to specify additional validation guidelines . |
 | Service Administration                      | [XEP-0133](https://xmpp.org/extensions/xep-0133.html)  | n/a       | Recommended best practices for service-level administration of servers and components using Ad-Hoc Commands. |
 | Stream Compression                          | [XEP-0138](https://xmpp.org/extensions/xep-0138.html)  | n/a       | Support for optional compression of the XMPP stream.
 | Data Forms Layout                           | [XEP-0141](https://xmpp.org/extensions/xep-0141.html)  | n/a       | Enables an application to specify form layouts. |
 | Personal Eventing Protocol                  | [XEP-0163](https://xmpp.org/extensions/xep-0163.html)  | n/a       | Using the XMPP publish-subscribe protocol to broadcast state change events associated with an XMPP account. |
+| [Jingle](jingle.html)                       | [XEP-0166](https://xmpp.org/extensions/xep-0166.html)  | n/a       | Initiate and manage sessions between two XMPP entities. |
 | Message Delivery Receipts                   | [XEP-0184](https://xmpp.org/extensions/xep-0184.html)  | n/a       | Extension for message delivery receipts. The sender can request notification that the message has been delivered. |
 | [Blocking Command](blockingcommand.md)      | [XEP-0191](https://xmpp.org/extensions/xep-0191.html)  | n/a       | Communications blocking that is intended to be simpler than privacy lists (XEP-0016). |
 | XMPP Ping                                   | [XEP-0199](https://xmpp.org/extensions/xep-0199.html)  | n/a       | Sending application-level pings over XML streams.
 | Entity Time                                 | [XEP-0202](https://xmpp.org/extensions/xep-0202.html)  | n/a       | Allows entities to communicate their local time |
 | Delayed Delivery                            | [XEP-0203](https://xmpp.org/extensions/xep-0203.html)  | n/a       | Extension for communicating the fact that an XML stanza has been delivered with a delay. |
 | XMPP Over BOSH                              | [XEP-0206](https://xmpp.org/extensions/xep-0206.html)  | n/a       | Use Bidirectional-streams Over Synchronous HTTP (BOSH) to transport XMPP stanzas. |
+| Data Forms Media Element                    | [XEP-0221](https://xmpp.org/extensions/xep-0221.html)  | n/a       | Allows to include media data in XEP-0004 data forms. |
 | Attention                                   | [XEP-0224](https://xmpp.org/extensions/xep-0224.html)  | n/a       | Getting attention of another user. |
 | Bits of Binary                              | [XEP-0231](https://xmpp.org/extensions/xep-0231.html)  | n/a       | Including or referring to small bits of binary data in an XML stanza. |
 | Best Practices for Resource Locking         | [XEP-0296](https://xmpp.org/extensions/xep-0296.html)  | n/a       | Specifies best practices to be followed by Jabber/XMPP clients about when to lock into, and unlock away from, resources. |
 | Last Message Correction                     | [XEP-0308](https://xmpp.org/extensions/xep-0308.html)  | n/a       | Provides a method for indicating that a message is a correction of the last sent message. |
 | Last User Interaction in Presence           | [XEP-0319](https://xmpp.org/extensions/xep-0319.html)  | n/a       | Communicate time of last user interaction via XMPP presence notifications. |
+| Data Forms Geolocation Element              | [XEP-0350](https://xmpp.org/extensions/xep-0350.html)  | n/a       | Allows to include XEP-0080 gelocation data in XEP-0004 data forms.  |
 | [Group Chat Invitations](invitation.md)     | n/a                                                    | n/a       | Send invitations to other users to join a group chat room. |
 | [Jive Properties](properties.md)            | n/a                                                    | n/a       | TODO |
 
diff --git a/documentation/providers.md b/documentation/providers.md
index 00457d5d9..f5e57e705 100644
--- a/documentation/providers.md
+++ b/documentation/providers.md
@@ -23,7 +23,7 @@ Whenever a packet extension is found in a packet, parsing will be
 passed to the correct provider. Each provider must extend the
 ExtensionElementProvider abstract class. Each extension provider is
 responsible for parsing the raw XML stream, via the
-[XML Pull Parser](http://www.xmlpull.org/), to contruct an object.
+Smack's `XmlPullParser` interface, to construct an object.
 
 You can also create an introspection provider
 (`provider.IntrospectionProvider.PacketExtensionIntrospectionProvider`). Here,
@@ -161,9 +161,9 @@ public class MyIQProvider extends IQProvider<MyIQ> {
 
     // Start parsing loop
     outerloop: while(true) {
-      int eventType = parser.next();
+      XmlPullParser.Event eventType = parser.next();
       switch(eventType) {
-      case XmlPullParser.START_TAG:
+      case START_ELEMENT:
         String elementName = parser.getName();
         switch (elementName) {
         case "user":
@@ -175,12 +175,15 @@ public class MyIQProvider extends IQProvider<MyIQ> {
           break;
         }
         break;
-      case XmlPullParser.END_TAG:
+      case END_ELEMENT:
         // Abort condition: if the are on a end tag (closing element) of the same depth
         if (parser.getDepth() == initialDepth) {
           break outerloop;
         }
         break;
+      default:
+        // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+        break;
       }
     }
 
@@ -225,9 +228,9 @@ _Disco Items IQProvider_
 			String node = "";
 			discoverItems.setNode(parser.getAttributeValue("", "node"));
 			outerloop: while (true) {
-				int eventType = parser.next();
+				XmlPullParser.Event eventType = parser.next();
 				switch (eventType) {
-				case XmlPullParser.START_TAG:
+				case START_ELEMENT:
 					String elementName = parser.getName();
 					switch (elementName) {
 					case "item":
@@ -239,7 +242,7 @@ _Disco Items IQProvider_
 						break;
 					}
 					break;
-				case XmlPullParser.END_TAG:
+				case END_ELEMENT:
 					String elementName = parser.getName();
 					switch (elementName) {
 					case "item":
@@ -295,17 +298,17 @@ _Subscription PacketExtensionProvider Implementation_
 			String state = parser.getAttributeValue(null, "subscription");
 			boolean isRequired = false;
 
-			int tag = parser.next();
+			XmlPullParser.Event tag = parser.next();
 
-			if ((tag == XmlPullParser.START_TAG) && parser.getName().equals("subscribe-options")) {
+			if ((tag == XmlPullParser.START_ELEMENT) && parser.getName().equals("subscribe-options")) {
 				tag = parser.next();
 
-				if ((tag == XmlPullParser.START_TAG) && parser.getName().equals("required"))
+				if ((tag == XmlPullParser.START_ELEMENT) && parser.getName().equals("required"))
 					isRequired = true;
 
-				while (parser.next() != XmlPullParser.END_TAG && parser.getName() != "subscribe-options");
+				while (parser.next() != XmlPullParser.END_ELEMENT && parser.getName() != "subscribe-options");
 			}
-			while (parser.getEventType() != XmlPullParser.END_TAG) parser.next();
+			while (parser.getEventType() != XmlPullParser.END_ELEMENT) parser.next();
 			return new Subscription(jid, nodeId, subId, state == null ? null : Subscription.State.valueOf(state), isRequired);
 		}
 	}
diff --git a/resources/releasedocs/README.html b/resources/releasedocs/README.html
index 195858a8f..d25eaf624 100644
--- a/resources/releasedocs/README.html
+++ b/resources/releasedocs/README.html
@@ -169,14 +169,10 @@ recommended when using Smack.
 </p>
 
 <p>
-If you dont' use a
-dependency resolution system, like gradle or maven, then you will need
-to download at least
-the <a href="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/">Xml
-Pull Parser 3rd Edition (XPP3) library</a> or any other library that
-implements the XmlPullParser interface
-(like <a href="http://kxml.org/">kXML</a>) and the set of
-<a href="http://jxmpp.org">jXMPP libraries</a>.
+  Smack tries to depend on as few as possible libraries. The only
+  requirement is <a href="http://jxmpp.org">jXMPP</a>. For DNS
+  resolution we recommend to
+  use <a href="http://minidns.org">MiniDNS</a>.
 </p>
 
 <p>
diff --git a/settings.gradle b/settings.gradle
index 6188d60b6..d3b53d80e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,4 +28,7 @@ include 'smack-core',
 		'smack-omemo-signal',
 		'smack-omemo-signal-integration-test',
 		'smack-repl',
-		'smack-openpgp'
+		'smack-openpgp',
+		'smack-xmlparser',
+		'smack-xmlparser-stax',
+		'smack-xmlparser-xpp3'
diff --git a/smack-android/build.gradle b/smack-android/build.gradle
index 63fa35d2f..46827c09f 100644
--- a/smack-android/build.gradle
+++ b/smack-android/build.gradle
@@ -7,6 +7,7 @@ smack-extensions and smack-experimental."""
 // Note that the test dependencies (junit, …) are inferred from the
 // sourceSet.test of the core subproject
 dependencies {
+	api project(':smack-xmlparser-xpp3')
 	// Depend on minidns-android21 as optional dependency, even if may
 	// not need it. Can't hurt to have it in the programm path with
 	// the correct MiniDNS version as it won't hurt even if the
diff --git a/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java b/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java
index e6e43af59..b83d3014d 100644
--- a/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java
+++ b/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014-2018 Florian Schmaus
+ * Copyright © 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
  */
 package org.jivesoftware.smack.util.stringencoder.android;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.stringencoder.StringEncoder;
 
 import android.util.Base64;
@@ -39,21 +38,13 @@ public final class AndroidBase64UrlSafeEncoder implements StringEncoder<String>
 
     @Override
     public String encode(String string) {
-        try {
-            return Base64.encodeToString(string.getBytes(StringUtils.UTF8), BASE64_ENCODER_FLAGS);
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException("UTF-8 not supported", e);
-        }
+        return Base64.encodeToString(string.getBytes(StandardCharsets.UTF_8), BASE64_ENCODER_FLAGS);
     }
 
     @Override
     public String decode(String string) {
         byte[] bytes = Base64.decode(string, BASE64_ENCODER_FLAGS);
-        try {
-            return new String(bytes, StringUtils.UTF8);
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException("UTF-8 not supported", e);
-        }
+        return new String(bytes, StandardCharsets.UTF_8);
     }
 
 }
diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
index 7e1d97122..592e0633c 100644
--- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
+++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
@@ -20,7 +20,6 @@ package org.jivesoftware.smack.bosh;
 import java.io.IOException;
 import java.io.PipedReader;
 import java.io.PipedWriter;
-import java.io.StringReader;
 import java.io.Writer;
 import java.util.Map;
 import java.util.logging.Level;
@@ -44,6 +43,7 @@ import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure;
 import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Success;
 import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.igniterealtime.jbosh.AbstractBody;
 import org.igniterealtime.jbosh.BOSHClient;
@@ -56,11 +56,8 @@ import org.igniterealtime.jbosh.BOSHException;
 import org.igniterealtime.jbosh.BOSHMessageEvent;
 import org.igniterealtime.jbosh.BodyQName;
 import org.igniterealtime.jbosh.ComposableBody;
-
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.parts.Resourcepart;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
 
 /**
  * Creates a connection to an XMPP server via HTTP binding.
@@ -479,14 +476,13 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
                     if (streamId == null) {
                         streamId = body.getAttribute(BodyQName.create(XMPPBOSHConnection.BOSH_URI, "authid"));
                     }
-                    final XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-                    parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-                    parser.setInput(new StringReader(body.toXML()));
-                    int eventType = parser.getEventType();
+                    final XmlPullParser parser = PacketParserUtils.getParserFor(body.toXML());
+
+                    XmlPullParser.Event eventType = parser.getEventType();
                     do {
                         eventType = parser.next();
                         switch (eventType) {
-                        case XmlPullParser.START_TAG:
+                        case START_ELEMENT:
                             String name = parser.getName();
                             switch (name) {
                             case Message.ELEMENT:
@@ -528,9 +524,12 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
                                 }
                             }
                             break;
+                        default:
+                            // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                            break;
                         }
                     }
-                    while (eventType != XmlPullParser.END_DOCUMENT);
+                    while (eventType != XmlPullParser.Event.END_DOCUMENT);
                 }
                 catch (Exception e) {
                     if (isConnected()) {
diff --git a/smack-core/build.gradle b/smack-core/build.gradle
index 69ee5d468..40e9026d6 100644
--- a/smack-core/build.gradle
+++ b/smack-core/build.gradle
@@ -2,23 +2,27 @@ description = """\
 Smack core components."""
 
 ext {
-	xmlUnitVersion = "2.6.0"
-	powerMockVersion = "1.7.3"
+	xmlUnitVersion = '2.6.2'
 }
 
 dependencies {
-	compile 'xpp3:xpp3:1.1.4c'
+	compile project(':smack-xmlparser')
 	compile "org.jxmpp:jxmpp-core:$jxmppVersion"
 	compile "org.jxmpp:jxmpp-jid:$jxmppVersion"
 	compile "org.minidns:minidns-core:$miniDnsVersion"
+	testCompile project(':smack-xmlparser-stax')
+	testCompile project(':smack-xmlparser-xpp3')
 	testCompile "org.jxmpp:jxmpp-jid:$jxmppVersion:tests"
-	testCompile "org.junit.jupiter:junit-jupiter-api:$junitVersion"
-	testCompile "org.junit.vintage:junit-vintage-engine:$junitVersion"
 	testCompile "org.xmlunit:xmlunit-core:$xmlUnitVersion"
-	testCompile "org.xmlunit:xmlunit-legacy:$xmlUnitVersion"
-	testCompile "org.powermock:powermock-module-junit4:$powerMockVersion"
-	testCompile "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
-	testCompile "org.powermock:powermock-api-mockito2:$powerMockVersion"
+	// Explictily add assertj-core which is a dependency of
+	// xmlunit-assertj, but gradle fails to resolves it with:
+	// Execution failed for task ':smack-core:compileTestJava'.
+	// > Could not resolve all files for configuration ':smack-core:testCompileClasspath'.
+	//    > Could not find org.assertj:assertj-core:.
+	//		 Required by:
+	//			 project :smack-core > org.xmlunit:xmlunit-assertj:2.6.2
+	testCompile "org.assertj:assertj-core:3.11.1"
+	testCompile "org.xmlunit:xmlunit-assertj:$xmlUnitVersion"
 	testCompile 'com.jamesmurty.utils:java-xmlbuilder:1.2'
 }
 
diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
index e9261f516..ef7d5ee85 100644
--- a/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
+++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
@@ -16,9 +16,9 @@ package org.jivesoftware.smack.packet;
 
 import org.jivesoftware.smack.provider.PrivacyProvider;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.xmlpull.v1.XmlPullParserFactory;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParserFactory;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import java.io.StringReader;
 
diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
index e44c6e15a..9bceba3f7 100644
--- a/smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
+++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
@@ -32,8 +32,8 @@ import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.TCPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.util.ConnectionUtils;
-import org.xmlpull.v1.XmlPullParserFactory;
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserFactory;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 /**
  * Base class for all the test cases which provides a pre-configured execution context. This
@@ -414,9 +414,9 @@ public abstract class SmackTestCase extends TestCase {
             XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
             parser.setInput(systemStream, "UTF-8");
-            int eventType = parser.getEventType();
+            XmlPullParser.Event eventType = parser.getEventType();
             do {
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == START_ELEMENT) {
                     if (parser.getName().equals("host")) {
                         host = parser.nextText();
                     }
@@ -459,7 +459,7 @@ public abstract class SmackTestCase extends TestCase {
                 }
                 eventType = parser.next();
             }
-            while (eventType != XmlPullParser.END_DOCUMENT);
+            while (eventType != END_DOCUMENT);
             parsedOK = true;
         }
         catch (Exception e) {
diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
index a375e0d81..8d2a0df4f 100644
--- a/smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
+++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
@@ -20,9 +20,9 @@ import java.io.StringReader;
 
 import org.jivesoftware.smack.packet.XMPPError;
 import org.jivesoftware.smack.test.SmackTestCase;
-import org.xmlpull.v1.XmlPullParserFactory;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParserFactory;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class XMPPErrorTest extends SmackTestCase {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
index e82ad15aa..853d39e38 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.io.Writer;
 import java.lang.reflect.Constructor;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -64,6 +65,7 @@ import javax.net.ssl.X509TrustManager;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.PasswordCallback;
+import javax.xml.namespace.QName;
 
 import org.jivesoftware.smack.ConnectionConfiguration.DnssecMode;
 import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
@@ -121,6 +123,8 @@ import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.dns.HostAddress;
 import org.jivesoftware.smack.util.dns.SmackDaneProvider;
 import org.jivesoftware.smack.util.dns.SmackDaneVerifier;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityFullJid;
@@ -130,8 +134,6 @@ import org.jxmpp.jid.parts.Resourcepart;
 import org.jxmpp.stringprep.XmppStringprepException;
 import org.jxmpp.util.XmppStringUtils;
 import org.minidns.dnsname.DnsName;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 
 /**
@@ -233,11 +235,11 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
 
     private XmlEnvironment incomingStreamXmlEnvironment;
 
-    final Map<String, NonzaCallback> nonzaCallbacks = new HashMap<>();
+    final Map<QName, NonzaCallback> nonzaCallbacks = new HashMap<>();
 
     protected final Lock connectionLock = new ReentrantLock();
 
-    protected final Map<String, FullyQualifiedElement> streamFeatures = new HashMap<>();
+    protected final Map<QName, FullyQualifiedElement> streamFeatures = new HashMap<>();
 
     /**
      * The full JID of the authenticated user, as returned by the resource binding response of the server.
@@ -336,6 +338,12 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
             Thread thread = new Thread(runnable);
             thread.setName("Smack Cached Executor");
             thread.setDaemon(true);
+            thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread t, Throwable e) {
+                    LOGGER.log(Level.WARNING, t + " encountered uncaught exception", e);
+                }
+            });
             return thread;
         }
     });
@@ -381,8 +389,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
 
     protected Exception currentConnectionException;
 
-    private final Map<String, IQRequestHandler> setIqRequestHandler = new HashMap<>();
-    private final Map<String, IQRequestHandler> getIqRequestHandler = new HashMap<>();
+    private final Map<QName, IQRequestHandler> setIqRequestHandler = new HashMap<>();
+    private final Map<QName, IQRequestHandler> getIqRequestHandler = new HashMap<>();
 
     /**
      * Create a new XMPPConnection to an XMPP server.
@@ -1213,7 +1221,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     protected final void parseAndProcessNonza(XmlPullParser parser) throws IOException, XmlPullParserException, SmackParsingException {
         final String element = parser.getName();
         final String namespace = parser.getNamespace();
-        final String key = XmppStringUtils.generateKey(element, namespace);
+        final QName key = new QName(namespace, element);
 
         NonzaProvider<? extends Nonza> nonzaProvider = ProviderManager.getNonzaProvider(key);
         if (nonzaProvider == null) {
@@ -1243,7 +1251,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         try {
             stanza = PacketParserUtils.parseStanza(parser, incomingStreamXmlEnvironment);
         }
-        catch (Exception e) {
+        catch (XmlPullParserException | SmackParsingException | IOException e) {
             CharSequence content = PacketParserUtils.parseContentDepth(parser,
                             parserDepth);
             UnparseableStanza message = new UnparseableStanza(content, e);
@@ -1295,7 +1303,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
             final IQ iq = (IQ) packet;
             if (iq.isRequestIQ()) {
                 final IQ iqRequest = iq;
-                final String key = XmppStringUtils.generateKey(iq.getChildElementName(), iq.getChildElementNamespace());
+                final QName key = iqRequest.getChildElementQName();
                 IQRequestHandler iqRequestHandler;
                 final IQ.Type type = iq.getType();
                 switch (type) {
@@ -1614,9 +1622,9 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
         streamFeatures.clear();
         final int initialDepth = parser.getDepth();
         while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG && parser.getDepth() == initialDepth + 1) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getDepth() == initialDepth + 1) {
                 FullyQualifiedElement streamFeature = null;
                 String name = parser.getName();
                 String namespace = parser.getNamespace();
@@ -1647,7 +1655,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                     addStreamFeature(streamFeature);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG && parser.getDepth() == initialDepth) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && parser.getDepth() == initialDepth) {
                 break;
             }
         }
@@ -1686,7 +1694,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     @SuppressWarnings("unchecked")
     @Override
     public <F extends FullyQualifiedElement> F getFeature(String element, String namespace) {
-        return (F) streamFeatures.get(XmppStringUtils.generateKey(element, namespace));
+        QName qname = new QName(namespace, element);
+        return (F) streamFeatures.get(qname);
     }
 
     @Override
@@ -1695,7 +1704,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     }
 
     protected void addStreamFeature(FullyQualifiedElement feature) {
-        String key = XmppStringUtils.generateKey(feature.getElementName(), feature.getNamespace());
+        QName key = feature.getQName();
         streamFeatures.put(key, feature);
     }
 
@@ -1804,7 +1813,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
 
     @Override
     public IQRequestHandler registerIQRequestHandler(final IQRequestHandler iqRequestHandler) {
-        final String key = XmppStringUtils.generateKey(iqRequestHandler.getElement(), iqRequestHandler.getNamespace());
+        final QName key = iqRequestHandler.getQName();
         switch (iqRequestHandler.getType()) {
         case set:
             synchronized (setIqRequestHandler) {
@@ -1827,7 +1836,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
 
     @Override
     public IQRequestHandler unregisterIQRequestHandler(String element, String namespace, IQ.Type type) {
-        final String key = XmppStringUtils.generateKey(element, namespace);
+        final QName key = new QName(namespace, element);
         switch (type) {
         case set:
             synchronized (setIqRequestHandler) {
@@ -2044,13 +2053,13 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                 try {
                     Constructor<?> c = Class.forName("sun.security.pkcs11.SunPKCS11").getConstructor(InputStream.class);
                     String pkcs11Config = "name = SmartCard\nlibrary = " + config.getPKCS11Library();
-                    ByteArrayInputStream config = new ByteArrayInputStream(pkcs11Config.getBytes(StringUtils.UTF8));
+                    ByteArrayInputStream config = new ByteArrayInputStream(pkcs11Config.getBytes(StandardCharsets.UTF_8));
                     Provider p = (Provider) c.newInstance(config);
                     Security.addProvider(p);
-                    ks = KeyStore.getInstance("PKCS11",p);
-                    pcb = new PasswordCallback("PKCS11 Password: ",false);
+                    ks = KeyStore.getInstance("PKCS11", p);
+                    pcb = new PasswordCallback("PKCS11 Password: ", false);
                     callbackHandler.handle(new Callback[] {pcb});
-                    ks.load(null,pcb.getPassword());
+                    ks.load(null, pcb.getPassword());
                 }
                 catch (Exception e) {
                     LOGGER.log(Level.WARNING, "Exception", e);
@@ -2058,8 +2067,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                 }
             }
             else if ("Apple".equals(keyStoreType)) {
-                ks = KeyStore.getInstance("KeychainStore","Apple");
-                ks.load(null,null);
+                ks = KeyStore.getInstance("KeychainStore", "Apple");
+                ks.load(null, null);
                 // pcb = new PasswordCallback("Apple Keychain",false);
                 // pcb.setPassword(null);
             }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index b87f2ccd2..8c1c23135 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -25,6 +25,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.HostnameVerifier;
@@ -46,6 +48,7 @@ import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
 import org.jxmpp.stringprep.XmppStringprepException;
 import org.minidns.dnsname.DnsName;
+import org.minidns.dnsname.InvalidDnsNameException;
 import org.minidns.util.InetAddressUtil;
 
 /**
@@ -81,6 +84,8 @@ public abstract class ConnectionConfiguration {
         SmackConfiguration.getVersion();
     }
 
+    private static final Logger LOGGER = Logger.getLogger(ConnectionConfiguration.class.getName());
+
     /**
      * The XMPP domain of the XMPP Service. Usually servers use the same service name as the name
      * of the server. However, there are some servers like google where host would be
@@ -88,6 +93,8 @@ public abstract class ConnectionConfiguration {
      */
     protected final DomainBareJid xmppServiceDomain;
 
+    protected final DnsName xmppServiceDomainDnsName;
+
     protected final InetAddress hostAddress;
     protected final DnsName host;
     protected final int port;
@@ -149,7 +156,7 @@ public abstract class ConnectionConfiguration {
 
     private final boolean compressionEnabled;
 
-    protected ConnectionConfiguration(Builder<?,?> builder) {
+    protected ConnectionConfiguration(Builder<?, ?> builder) {
         authzid = builder.authzid;
         username = builder.username;
         password = builder.password;
@@ -162,6 +169,19 @@ public abstract class ConnectionConfiguration {
         if (xmppServiceDomain == null) {
             throw new IllegalArgumentException("Must define the XMPP domain");
         }
+
+        DnsName xmppServiceDomainDnsName;
+        try {
+            xmppServiceDomainDnsName = DnsName.from(xmppServiceDomain);
+        } catch (InvalidDnsNameException e) {
+            LOGGER.log(Level.INFO,
+                            "Could not transform XMPP service domain '" + xmppServiceDomain
+                          + "' to a DNS name. TLS X.509 certificate validiation may not be possible.",
+                            e);
+            xmppServiceDomainDnsName = null;
+        }
+        this.xmppServiceDomainDnsName = xmppServiceDomainDnsName;
+
         hostAddress = builder.hostAddress;
         host = builder.host;
         port = builder.port;
@@ -225,6 +245,17 @@ public abstract class ConnectionConfiguration {
         return xmppServiceDomain;
     }
 
+    /**
+     * Returns the XMPP service domain as DNS name if possible. Note that since not every XMPP address domainpart is a
+     * valid DNS name, this method may return <code>null</code>.
+     *
+     * @return the XMPP service domain as DNS name or <code>null</code>.
+     * @since 4.3.4
+     */
+    public DnsName getXmppServiceDomainAsDnsNameIfPossible() {
+        return xmppServiceDomainDnsName;
+    }
+
     /**
      * Returns the TLS security mode used when making the connection. By default,
      * the mode is {@link SecurityMode#ifpossible}.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/NonzaCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/NonzaCallback.java
index acc776533..3bdd04bfb 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/NonzaCallback.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/NonzaCallback.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus
+ * Copyright 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,18 +19,18 @@ package org.jivesoftware.smack;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException.FailedNonzaException;
 import org.jivesoftware.smack.packet.Nonza;
 import org.jivesoftware.smack.util.XmppElementUtil;
 
-import org.jxmpp.util.XmppStringUtils;
-
 public class NonzaCallback {
 
     protected final AbstractXMPPConnection connection;
-    protected final Map<String, GenericElementListener<? extends Nonza>> filterAndListeners;
+    protected final Map<QName, GenericElementListener<? extends Nonza>> filterAndListeners;
 
     private NonzaCallback(Builder builder) {
         this.connection = builder.connection;
@@ -39,7 +39,7 @@ public class NonzaCallback {
     }
 
     void onNonzaReceived(Nonza nonza) {
-        String key = XmppStringUtils.generateKey(nonza.getElementName(), nonza.getNamespace());
+        QName key = nonza.getQName();
         GenericElementListener<? extends Nonza> nonzaListener = filterAndListeners.get(key);
 
         nonzaListener.processElement(nonza);
@@ -47,8 +47,8 @@ public class NonzaCallback {
 
     public void cancel() {
         synchronized (connection.nonzaCallbacks) {
-            for (Map.Entry<String, GenericElementListener<? extends Nonza>> entry : filterAndListeners.entrySet()) {
-                String filterKey = entry.getKey();
+            for (Map.Entry<QName, GenericElementListener<? extends Nonza>> entry : filterAndListeners.entrySet()) {
+                QName filterKey = entry.getKey();
                 NonzaCallback installedCallback = connection.nonzaCallbacks.get(filterKey);
                 if (equals(installedCallback)) {
                     connection.nonzaCallbacks.remove(filterKey);
@@ -63,7 +63,7 @@ public class NonzaCallback {
         }
 
         synchronized (connection.nonzaCallbacks) {
-            for (String key : filterAndListeners.keySet()) {
+            for (QName key : filterAndListeners.keySet()) {
                 connection.nonzaCallbacks.put(key, this);
             }
         }
@@ -78,8 +78,8 @@ public class NonzaCallback {
                         Builder builder) {
             super(builder);
 
-            final String successNonzaKey = XmppElementUtil.getKeyFor(successNonzaClass);
-            final String failedNonzaKey = XmppElementUtil.getKeyFor(failedNonzaClass);
+            final QName successNonzaKey = XmppElementUtil.getQNameFor(successNonzaClass);
+            final QName failedNonzaKey = XmppElementUtil.getQNameFor(failedNonzaClass);
 
             final GenericElementListener<SN> successListener = new GenericElementListener<SN>(successNonzaClass) {
                 @Override
@@ -139,14 +139,14 @@ public class NonzaCallback {
     public static final class Builder {
         private final AbstractXMPPConnection connection;
 
-        private Map<String, GenericElementListener<? extends Nonza>> filterAndListeners = new HashMap<>();
+        private Map<QName, GenericElementListener<? extends Nonza>> filterAndListeners = new HashMap<>();
 
         Builder(AbstractXMPPConnection connection) {
             this.connection = connection;
         }
 
         public <N extends Nonza> Builder listenFor(Class<? extends N> nonza, GenericElementListener<? extends N> nonzaListener) {
-            String key = XmppElementUtil.getKeyFor(nonza);
+            QName key = XmppElementUtil.getQNameFor(nonza);
             filterAndListeners.put(key, nonzaListener);
             return this;
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
index 10695df47..6f06e4d33 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
@@ -29,6 +29,7 @@ import javax.net.ssl.HostnameVerifier;
 import org.jivesoftware.smack.compression.XMPPInputOutputStream;
 import org.jivesoftware.smack.debugger.ReflectionDebuggerFactory;
 import org.jivesoftware.smack.debugger.SmackDebuggerFactory;
+import org.jivesoftware.smack.parsing.ExceptionThrowingCallback;
 import org.jivesoftware.smack.parsing.ExceptionThrowingCallbackWithHint;
 import org.jivesoftware.smack.parsing.ParsingExceptionCallback;
 import org.jivesoftware.smack.util.Objects;
@@ -380,4 +381,5 @@ public final class SmackConfiguration {
     public static int getDefaultConcurrencyLevelLimit() {
         return defaultConcurrencyLevelLimit;
     }
+
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
index 701004696..5bcf27b2f 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackInitialization.java
@@ -20,6 +20,7 @@ package org.jivesoftware.smack;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
@@ -44,10 +45,9 @@ import org.jivesoftware.smack.sasl.core.SCRAMSHA1Mechanism;
 import org.jivesoftware.smack.sasl.core.ScramSha1PlusMechanism;
 import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.FileUtils;
-import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 
 public final class SmackInitialization {
@@ -69,7 +69,7 @@ public final class SmackInitialization {
         String smackVersion;
         BufferedReader reader = null;
         try {
-            reader = new BufferedReader(new InputStreamReader(FileUtils.getStreamForClasspathFile("org.jivesoftware.smack/version", null), StringUtils.UTF8));
+            reader = new BufferedReader(new InputStreamReader(FileUtils.getStreamForClasspathFile("org.jivesoftware.smack/version", null), StandardCharsets.UTF_8));
             smackVersion = reader.readLine();
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Could not determine Smack version", e);
@@ -141,12 +141,10 @@ public final class SmackInitialization {
 
     public static void processConfigFile(InputStream cfgFileStream,
                     Collection<Exception> exceptions, ClassLoader classLoader) throws Exception {
-        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        parser.setInput(cfgFileStream, "UTF-8");
-        int eventType = parser.getEventType();
+        XmlPullParser parser = PacketParserUtils.getParserFor(cfgFileStream);
+        XmlPullParser.Event eventType = parser.getEventType();
         do {
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("startupClasses")) {
                     parseClassesToLoad(parser, false, exceptions, classLoader);
                 }
@@ -156,7 +154,7 @@ public final class SmackInitialization {
             }
             eventType = parser.next();
         }
-        while (eventType != XmlPullParser.END_DOCUMENT);
+        while (eventType != XmlPullParser.Event.END_DOCUMENT);
         CloseableUtil.maybeClose(cfgFileStream, LOGGER);
     }
 
@@ -164,12 +162,10 @@ public final class SmackInitialization {
                     Collection<Exception> exceptions, ClassLoader classLoader)
                     throws Exception {
         final String startName = parser.getName();
-        int eventType;
-        String name;
+        XmlPullParser.Event eventType;
         outerloop: do {
             eventType = parser.next();
-            name = parser.getName();
-            if (eventType == XmlPullParser.START_TAG && "className".equals(name)) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT && "className".equals(parser.getName())) {
                 String classToLoad = parser.nextText();
                 if (SmackConfiguration.isDisabledSmackClass(classToLoad)) {
                     continue outerloop;
@@ -188,7 +184,7 @@ public final class SmackInitialization {
                 }
             }
         }
-        while (!(eventType == XmlPullParser.END_TAG && startName.equals(name)));
+        while (!(eventType == XmlPullParser.Event.END_ELEMENT && startName.equals(parser.getName())));
     }
 
     private static void loadSmackClass(String className, boolean optional, ClassLoader classLoader) throws Exception {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackReactor.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackReactor.java
index ffc622633..b7fdc6877 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/SmackReactor.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackReactor.java
@@ -149,9 +149,8 @@ public class SmackReactor {
         long releaseTimeEpoch = System.currentTimeMillis() + unit.toMillis(delay);
         Date releaseTimeDate = new Date(releaseTimeEpoch);
         ScheduledAction scheduledAction = new ScheduledAction(runnable, releaseTimeDate, this);
-        synchronized (scheduledActions) {
-            scheduledActions.add(scheduledAction);
-        }
+        scheduledActions.add(scheduledAction);
+        selector.wakeup();
         return scheduledAction;
     }
 
@@ -209,7 +208,8 @@ public class SmackReactor {
 
             long selectWait;
             if (nextScheduledAction == null) {
-                // There is no next scheduled action, wait indefinitely in select().
+                // There is no next scheduled action, wait indefinitely in select() or until another thread invokes
+                // selector.wakeup().
                 selectWait = 0;
             } else {
                 selectWait = nextScheduledAction.getTimeToDueMillis();
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
index 9d3eeeda8..93c15244e 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2016-2018 Florian Schmaus.
+ * Copyright 2003-2007 Jive Software, 2016-2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ import org.jivesoftware.smack.packet.Stanza;
  * @see XMPPConnection#createStanzaCollector(StanzaFilter)
  * @author Matt Tucker
  */
-public class StanzaCollector implements AutoCloseable {
+public final class StanzaCollector implements AutoCloseable {
 
     private final StanzaFilter packetFilter;
 
@@ -69,7 +69,7 @@ public class StanzaCollector implements AutoCloseable {
      * @param connection the connection the collector is tied to.
      * @param configuration the configuration used to construct this collector
      */
-    protected StanzaCollector(XMPPConnection connection, Configuration configuration) {
+    StanzaCollector(XMPPConnection connection, Configuration configuration) {
         this.connection = connection;
         this.packetFilter = configuration.packetFilter;
         this.resultQueue = new ArrayDeque<>(configuration.size);
@@ -98,18 +98,6 @@ public class StanzaCollector implements AutoCloseable {
         }
     }
 
-    /**
-     * Returns the stanza filter associated with this stanza collector. The packet
-     * filter is used to determine what packets are queued as results.
-     *
-     * @return the stanza filter.
-     * @deprecated use {@link #getStanzaFilter()} instead.
-     */
-    @Deprecated
-    public StanzaFilter getPacketFilter() {
-        return getStanzaFilter();
-    }
-
     /**
      * Returns the stanza filter associated with this stanza collector. The stanza
      * filter is used to determine what stanzas are queued as results.
@@ -329,6 +317,21 @@ public class StanzaCollector implements AutoCloseable {
         return resultQueue.size();
     }
 
+    private String stringCache;
+
+    @Override
+    public String toString() {
+        if (stringCache == null) {
+            StringBuilder sb = new StringBuilder(128);
+            sb.append("Stanza Collector filter='").append(packetFilter).append('\'');
+            if (request != null) {
+                sb.append(" request='").append(request).append('\'');
+            }
+            stringCache = sb.toString();
+        }
+        return stringCache;
+    }
+
     synchronized void notifyConnectionError(Exception exception) {
         connectionException = exception;
         notifyAll();
@@ -380,19 +383,6 @@ public class StanzaCollector implements AutoCloseable {
         private Configuration() {
         }
 
-        /**
-         * Set the stanza filter used by this collector. If <code>null</code>, then all packets will
-         * get collected by this collector.
-         *
-         * @param packetFilter
-         * @return a reference to this configuration.
-         * @deprecated use {@link #setStanzaFilter(StanzaFilter)} instead.
-         */
-        @Deprecated
-        public Configuration setPacketFilter(StanzaFilter packetFilter) {
-            return setStanzaFilter(packetFilter);
-        }
-
         /**
          * Set the stanza filter used by this collector. If <code>null</code>, then all stanzas will
          * get collected by this collector.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/CompressedProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/CompressedProvider.java
index 8b02ef95b..fbed9abd3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/CompressedProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/CompressedProvider.java
@@ -20,7 +20,7 @@ import org.jivesoftware.smack.compress.packet.Compressed;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.NonzaProvider;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public final class CompressedProvider extends NonzaProvider<Compressed> {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/FailureProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/FailureProvider.java
index eaa9a980d..cf90f594b 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/FailureProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/compress/provider/FailureProvider.java
@@ -27,8 +27,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.NonzaProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public final class FailureProvider extends NonzaProvider<Failure> {
 
@@ -46,9 +46,9 @@ public final class FailureProvider extends NonzaProvider<Failure> {
         XmlEnvironment failureXmlEnvironment = XmlEnvironment.from(parser, xmlEnvironment);
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (namespace) {
@@ -72,11 +72,12 @@ public final class FailureProvider extends NonzaProvider<Failure> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default: // fall out
             }
         }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/datatypes/Scalar.java b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/Scalar.java
new file mode 100644
index 000000000..fe2bca23a
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/Scalar.java
@@ -0,0 +1,70 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.datatypes;
+
+public abstract class Scalar extends java.lang.Number {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private final java.lang.Number number;
+
+    protected Scalar(java.lang.Number number) {
+        this.number = number;
+    }
+
+    public final Number number() {
+        return number;
+    }
+
+    @Override
+    public final int intValue() {
+        return number.intValue();
+    }
+
+    @Override
+    public final long longValue() {
+        return number.longValue();
+    }
+
+    @Override
+    public final float floatValue() {
+        return number.floatValue();
+    }
+
+    @Override
+    public final double doubleValue() {
+        return number.doubleValue();
+    }
+
+    @Override
+    public final int hashCode() {
+        return number.hashCode();
+    }
+
+    @Override
+    public final boolean equals(Object other) {
+        return number.equals(other);
+    }
+
+    @Override
+    public final String toString() {
+        return number.toString();
+    }
+}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/datatypes/UInt16.java b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/UInt16.java
new file mode 100644
index 000000000..999597401
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/UInt16.java
@@ -0,0 +1,42 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.datatypes;
+
+import org.jivesoftware.smack.util.NumberUtil;
+
+/**
+ * A number representing an unsigned 16-bit integer. Can be used for values with the XML schema type "xs:unsingedShort".
+ */
+public final class UInt16 extends Scalar {
+
+    private static final long serialVersionUID = 1L;
+
+    private final int number;
+
+    private UInt16(int number) {
+        super(NumberUtil.requireUShort16(number));
+        this.number = number;
+    }
+
+    public int nativeRepresentation() {
+        return number;
+    }
+
+    public static UInt16 from(int number) {
+        return new UInt16(number);
+    }
+}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/datatypes/UInt32.java b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/UInt32.java
new file mode 100644
index 000000000..cb6c9aa28
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/UInt32.java
@@ -0,0 +1,42 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.datatypes;
+
+import org.jivesoftware.smack.util.NumberUtil;
+
+/**
+ * A number representing an unsigned 32-bit integer. Can be used for values with the XML schema type "xs:unsignedInt".
+ */
+public final class UInt32 extends Scalar {
+
+    private static final long serialVersionUID = 1L;
+
+    private final long number;
+
+    private UInt32(long number) {
+        super(NumberUtil.requireUInt32(number));
+        this.number = number;
+    }
+
+    public long nativeRepresentation() {
+        return number;
+    }
+
+    public static UInt32 from(long number) {
+        return new UInt32(number);
+    }
+}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/datatypes/package-info.java b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/package-info.java
new file mode 100644
index 000000000..15c7fd36f
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/datatypes/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Custom datatypes for Integers.
+ */
+package org.jivesoftware.smack.datatypes;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/fsm/AbstractXmppStateMachineConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/fsm/AbstractXmppStateMachineConnection.java
index 99c8ac6b6..3330202d3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/fsm/AbstractXmppStateMachineConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/fsm/AbstractXmppStateMachineConnection.java
@@ -57,10 +57,10 @@ import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Challenge;
 import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Success;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.parts.Resourcepart;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public abstract class AbstractXmppStateMachineConnection extends AbstractXMPPConnection {
 
@@ -310,10 +310,10 @@ public abstract class AbstractXmppStateMachineConnection extends AbstractXMPPCon
         // Skip the enclosing stream open what is guaranteed to be there.
         parser.next();
 
-        int event = parser.getEventType();
+        XmlPullParser.Event event = parser.getEventType();
         outerloop: while (true) {
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 final String name = parser.getName();
                 // Note that we don't handle "stream" here as it's done in the splitter.
                 switch (name) {
@@ -353,8 +353,9 @@ public abstract class AbstractXmppStateMachineConnection extends AbstractXMPPCon
                     break;
                 }
                 break;
-            case XmlPullParser.END_DOCUMENT:
+            case END_DOCUMENT:
                 break outerloop;
+            default: // fall out
             }
             event = parser.next();
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java b/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
index 9e3d9729c..1162ef755 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/iqrequest/IQRequestHandler.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015 Florian Schmaus
+ * Copyright 2015-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smack.iqrequest;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.packet.IQ;
 
 /**
@@ -50,4 +52,8 @@ public interface IQRequestHandler {
     String getElement();
 
     String getNamespace();
+
+    default QName getQName() {
+        return new QName(getNamespace(), getElement());
+    }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java
index d01d9cdb6..56090d568 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java
@@ -52,7 +52,7 @@ public class DefaultExtensionElement implements ExtensionElement {
 
     private String elementName;
     private String namespace;
-    private Map<String,String> map;
+    private Map<String, String> map;
 
     /**
      * Creates a new generic stanza extension.
@@ -107,7 +107,7 @@ public class DefaultExtensionElement implements ExtensionElement {
         if (map == null) {
             return Collections.emptySet();
         }
-        return Collections.unmodifiableSet(new HashMap<String,String>(map).keySet());
+        return Collections.unmodifiableSet(new HashMap<String, String>(map).keySet());
     }
 
     /**
@@ -131,7 +131,7 @@ public class DefaultExtensionElement implements ExtensionElement {
      */
     public synchronized void setValue(String name, String value) {
         if (map == null) {
-            map = new HashMap<String,String>();
+            map = new HashMap<String, String>();
         }
         map.put(name, value);
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/FullyQualifiedElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/FullyQualifiedElement.java
index 37e1b425a..1ed979548 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/FullyQualifiedElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/FullyQualifiedElement.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus
+ * Copyright 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smack.packet;
 
+import javax.xml.namespace.QName;
+
 public interface FullyQualifiedElement extends NamedElement {
 
     /**
@@ -25,4 +27,9 @@ public interface FullyQualifiedElement extends NamedElement {
      */
     String getNamespace();
 
+    default QName getQName() {
+        String namespaceURI = getNamespace();
+        String localPart = getElementName();
+        return new QName(namespaceURI, localPart);
+    }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
index 9b15c9c95..322890fa7 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
@@ -20,6 +20,8 @@ package org.jivesoftware.smack.packet;
 import java.util.List;
 import java.util.Locale;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
@@ -46,6 +48,7 @@ public abstract class IQ extends Stanza {
     public static final String IQ_ELEMENT = "iq";
     public static final String QUERY_ELEMENT = "query";
 
+    private final QName childElementQName;
     private final String childElementName;
     private final String childElementNamespace;
 
@@ -56,6 +59,7 @@ public abstract class IQ extends Stanza {
         type = iq.getType();
         this.childElementName = iq.childElementName;
         this.childElementNamespace = iq.childElementNamespace;
+        this.childElementQName = iq.childElementQName;
     }
 
     protected IQ(String childElementName) {
@@ -65,6 +69,11 @@ public abstract class IQ extends Stanza {
     protected IQ(String childElementName, String childElementNamespace) {
         this.childElementName = childElementName;
         this.childElementNamespace = childElementNamespace;
+        if (childElementName == null) {
+            childElementQName = null;
+        } else {
+            childElementQName = new QName(childElementNamespace, childElementName);
+        }
     }
 
     /**
@@ -115,6 +124,10 @@ public abstract class IQ extends Stanza {
         return !isRequestIQ();
     }
 
+    public final QName getChildElementQName() {
+        return childElementQName;
+    }
+
     public final String getChildElementName() {
         return childElementName;
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
index fe29d4c3d..dece4f384 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
+import org.jivesoftware.smack.util.EqualsUtil;
+import org.jivesoftware.smack.util.HashCode;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.TypedCloneable;
 import org.jivesoftware.smack.util.XmlStringBuilder;
@@ -561,32 +563,22 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
             return subject;
         }
 
+        private final HashCode.Cache hashCodeCache = new HashCode.Cache();
 
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            if (language != null) {
-                result = prime * result + this.language.hashCode();
-            }
-            result = prime * result + this.subject.hashCode();
-            return result;
+            return hashCodeCache.getHashCode(c ->
+                c.append(language)
+                 .append(subject)
+            );
         }
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            Subject other = (Subject) obj;
-            // simplified comparison because language and subject are always set
-            return this.language.equals(other.language) && this.subject.equals(other.subject);
+            return EqualsUtil.equals(this, obj, (e, o) ->
+                e.append(language, o.language)
+                 .append(subject, o.subject)
+            );
         }
 
         @Override
@@ -670,31 +662,22 @@ public final class Message extends Stanza implements TypedCloneable<Message> {
             return message;
         }
 
+        private final HashCode.Cache hashCodeCache = new HashCode.Cache();
+
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            if (language != null) {
-                result = prime * result + this.language.hashCode();
-            }
-            result = prime * result + this.message.hashCode();
-            return result;
+            return hashCodeCache.getHashCode(c ->
+                c.append(language)
+                .append(message)
+            );
         }
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            Body other = (Body) obj;
-            // simplified comparison because language and message are always set
-            return Objects.equals(this.language, other.language) && this.message.equals(other.message);
+            return EqualsUtil.equals(this, obj, (e, o) ->
+                e.append(language, o.language)
+                 .append(message, o.message)
+            );
         }
 
         @Override
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
index f8ff0a8f9..d4451ae68 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
@@ -150,7 +150,7 @@ public interface Packet extends TopLevelStreamElement {
     /**
      * Returns the first extension of this stanza that has the given namespace.
      * <p>
-     * When possible, use {@link #getExtension(String,String)} instead.
+     * When possible, use {@link #getExtension(String, String)} instead.
      * </p>
      *
      * @param namespace the namespace of the extension that is desired.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
index 2279cde26..114cef1b1 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
@@ -68,12 +68,12 @@ public final class Presence extends Stanza implements TypedCloneable<Presence> {
     private String status = null;
 
     /**
-     * The priority of the presence. The magic value {@link Integer#MIN_VALUE} is used to indicate that the original
+     * The priority of the presence. It is <code>null</code> to indicate that the original
      * presence stanza did not had an explicit priority set. In which case the priority defaults to 0.
      *
      * @see <a href="https://tools.ietf.org/html/rfc6121#section-4.7.2.3">RFC 6121 § 4.7.2.3.</a>
      */
-    private int priority = Integer.MIN_VALUE;
+    private Byte priority;
 
     private Mode mode = null;
 
@@ -203,13 +203,13 @@ public final class Presence extends Stanza implements TypedCloneable<Presence> {
     }
 
     /**
-     * Returns the priority of the presence, or Integer.MIN_VALUE if no priority has been set.
+     * Returns the priority of the presence.
      *
      * @return the priority.
      * @see <a href="https://tools.ietf.org/html/rfc6121#section-4.7.2.3">RFC 6121 § 4.7.2.3. Priority Element</a>
      */
     public int getPriority() {
-        if (priority == Integer.MIN_VALUE) {
+        if (priority == null) {
             return 0;
         }
         return priority;
@@ -227,6 +227,10 @@ public final class Presence extends Stanza implements TypedCloneable<Presence> {
             throw new IllegalArgumentException("Priority value " + priority +
                     " is not valid. Valid range is -128 through 127.");
         }
+        setPriority((byte) priority);
+    }
+
+    public void setPriority(byte priority) {
         this.priority = priority;
     }
 
@@ -264,7 +268,7 @@ public final class Presence extends Stanza implements TypedCloneable<Presence> {
         if (!StringUtils.isNullOrEmpty(status)) {
             sb.append("status=").append(status).append(',');
         }
-        if (priority != Integer.MIN_VALUE) {
+        if (priority != null) {
             sb.append("prio=").append(priority).append(',');
         }
         sb.append(']');
@@ -282,9 +286,7 @@ public final class Presence extends Stanza implements TypedCloneable<Presence> {
         buf.rightAngleBracket();
 
         buf.optElement("status", status);
-        if (priority != Integer.MIN_VALUE) {
-            buf.element("priority", Integer.toString(priority));
-        }
+        buf.optElement("priority", priority);
         if (mode != null && mode != Mode.available) {
             buf.element("show", mode);
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java
index 74d598bc6..fd7229b84 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015 Florian Schmaus.
+ * Copyright 2015-2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.util.MultiMap;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
-import org.jxmpp.util.XmppStringUtils;
-
 /**
  * An {@link ExtensionElement} modeling the often required and used XML features when using XMPP. It
  * is therefore suitable for most use cases. Use
@@ -47,7 +47,7 @@ public final class StandardExtensionElement implements ExtensionElement {
     private final String namespace;
     private final Map<String, String> attributes;
     private final String text;
-    private final MultiMap<String, StandardExtensionElement> elements;
+    private final MultiMap<QName, StandardExtensionElement> elements;
 
     private XmlStringBuilder xmlCache;
 
@@ -65,7 +65,7 @@ public final class StandardExtensionElement implements ExtensionElement {
     }
 
     private StandardExtensionElement(String name, String namespace, Map<String, String> attributes, String text,
-                    MultiMap<String, StandardExtensionElement> elements) {
+                    MultiMap<QName, StandardExtensionElement> elements) {
         this.name = StringUtils.requireNotNullNorEmpty(name, "Name must not be null nor empty");
         this.namespace = StringUtils.requireNotNullNorEmpty(namespace, "Namespace must not be null nor empty");
         if (attributes == null) {
@@ -100,7 +100,7 @@ public final class StandardExtensionElement implements ExtensionElement {
         if (elements == null) {
             return null;
         }
-        String key = XmppStringUtils.generateKey(element, namespace);
+        QName key = new QName(namespace, element);
         return elements.getFirst(key);
     }
 
@@ -112,7 +112,7 @@ public final class StandardExtensionElement implements ExtensionElement {
         if (elements == null) {
             return null;
         }
-        String key = XmppStringUtils.generateKey(element, namespace);
+        QName key = new QName(namespace, element);
         return elements.getAll(key);
     }
 
@@ -145,7 +145,7 @@ public final class StandardExtensionElement implements ExtensionElement {
         xml.optEscape(text);
 
         if (elements != null) {
-            for (Map.Entry<String, StandardExtensionElement> entry : elements.entrySet()) {
+            for (Map.Entry<QName, StandardExtensionElement> entry : elements.entrySet()) {
                 xml.append(entry.getValue().toXML(getNamespace()));
             }
         }
@@ -165,7 +165,7 @@ public final class StandardExtensionElement implements ExtensionElement {
 
         private Map<String, String> attributes;
         private String text;
-        private MultiMap<String, StandardExtensionElement> elements;
+        private MultiMap<QName, StandardExtensionElement> elements;
 
         private Builder(String name, String namespace) {
             this.name = name;
@@ -200,7 +200,8 @@ public final class StandardExtensionElement implements ExtensionElement {
             if (elements == null) {
                 elements = new MultiMap<>();
             }
-            String key = XmppStringUtils.generateKey(element.getElementName(), element.getNamespace());
+
+            QName key = element.getQName();
             elements.put(key, element);
             return this;
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
index 21e6d79d4..f40f5ba22 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
@@ -23,6 +23,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.packet.id.StanzaIdUtil;
 import org.jivesoftware.smack.util.MultiMap;
 import org.jivesoftware.smack.util.PacketUtil;
@@ -31,7 +33,6 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.jxmpp.util.XmppStringUtils;
 
 /**
  * Base class for XMPP Stanzas, which are called Stanza in older versions of Smack (i.e. &lt; 4.1).
@@ -56,7 +57,7 @@ public abstract class Stanza implements TopLevelStreamElement {
     protected static final String DEFAULT_LANGUAGE =
             java.util.Locale.getDefault().getLanguage().toLowerCase(Locale.US);
 
-    private final MultiMap<String, ExtensionElement> packetExtensions = new MultiMap<>();
+    private final MultiMap<QName, ExtensionElement> extensionElements = new MultiMap<>();
 
     private String id = null;
     private Jid to;
@@ -306,9 +307,9 @@ public abstract class Stanza implements TopLevelStreamElement {
      * @return a list of all extension elements of this stanza.
      */
     public List<ExtensionElement> getExtensions() {
-        synchronized (packetExtensions) {
+        synchronized (extensionElements) {
             // No need to create a new list, values() will already create a new one for us
-            return packetExtensions.values();
+            return extensionElements.values();
         }
     }
 
@@ -326,14 +327,14 @@ public abstract class Stanza implements TopLevelStreamElement {
     public List<ExtensionElement> getExtensions(String elementName, String namespace) {
         requireNotNullNorEmpty(elementName, "elementName must not be null nor empty");
         requireNotNullNorEmpty(namespace, "namespace must not be null nor empty");
-        String key = XmppStringUtils.generateKey(elementName, namespace);
-        return packetExtensions.getAll(key);
+        QName key = new QName(namespace, elementName);
+        return extensionElements.getAll(key);
     }
 
     /**
      * Returns the first extension of this stanza that has the given namespace.
      * <p>
-     * When possible, use {@link #getExtension(String,String)} instead.
+     * When possible, use {@link #getExtension(String, String)} instead.
      * </p>
      *
      * @param namespace the namespace of the extension that is desired.
@@ -359,10 +360,10 @@ public abstract class Stanza implements TopLevelStreamElement {
         if (namespace == null) {
             return null;
         }
-        String key = XmppStringUtils.generateKey(elementName, namespace);
+        QName key = new QName(namespace, elementName);
         ExtensionElement packetExtension;
-        synchronized (packetExtensions) {
-            packetExtension = packetExtensions.getFirst(key);
+        synchronized (extensionElements) {
+            packetExtension = extensionElements.getFirst(key);
         }
         if (packetExtension == null) {
             return null;
@@ -377,9 +378,9 @@ public abstract class Stanza implements TopLevelStreamElement {
      */
     public void addExtension(ExtensionElement extension) {
         if (extension == null) return;
-        String key = XmppStringUtils.generateKey(extension.getElementName(), extension.getNamespace());
-        synchronized (packetExtensions) {
-            packetExtensions.put(key, extension);
+        QName key = extension.getQName();
+        synchronized (extensionElements) {
+            extensionElements.put(key, extension);
         }
     }
 
@@ -393,7 +394,7 @@ public abstract class Stanza implements TopLevelStreamElement {
      */
     public ExtensionElement overrideExtension(ExtensionElement extension) {
         if (extension == null) return null;
-        synchronized (packetExtensions) {
+        synchronized (extensionElements) {
             // Note that we need to use removeExtension(String, String) here. If would use
             // removeExtension(ExtensionElement) then we would remove based on the equality of ExtensionElement, which
             // is not what we want in this case.
@@ -429,9 +430,9 @@ public abstract class Stanza implements TopLevelStreamElement {
         if (elementName == null) {
             return hasExtension(namespace);
         }
-        String key = XmppStringUtils.generateKey(elementName, namespace);
-        synchronized (packetExtensions) {
-            return packetExtensions.containsKey(key);
+        QName key = new QName(namespace, elementName);
+        synchronized (extensionElements) {
+            return extensionElements.containsKey(key);
         }
     }
 
@@ -442,8 +443,8 @@ public abstract class Stanza implements TopLevelStreamElement {
      * @return true if a stanza extension exists, false otherwise.
      */
     public boolean hasExtension(String namespace) {
-        synchronized (packetExtensions) {
-            for (ExtensionElement packetExtension : packetExtensions.values()) {
+        synchronized (extensionElements) {
+            for (ExtensionElement packetExtension : extensionElements.values()) {
                 if (packetExtension.getNamespace().equals(namespace)) {
                     return true;
                 }
@@ -460,9 +461,9 @@ public abstract class Stanza implements TopLevelStreamElement {
      * @return the removed stanza extension or null.
      */
     public ExtensionElement removeExtension(String elementName, String namespace) {
-        String key = XmppStringUtils.generateKey(elementName, namespace);
-        synchronized (packetExtensions) {
-            return packetExtensions.remove(key);
+        QName key = new QName(namespace, elementName);
+        synchronized (extensionElements) {
+            return extensionElements.remove(key);
         }
     }
 
@@ -473,9 +474,9 @@ public abstract class Stanza implements TopLevelStreamElement {
      * @return the removed stanza extension or null.
      */
     public ExtensionElement removeExtension(ExtensionElement extension)  {
-        String key = XmppStringUtils.generateKey(extension.getElementName(), extension.getNamespace());
-        synchronized (packetExtensions) {
-            List<ExtensionElement> list = packetExtensions.getAll(key);
+        QName key = extension.getQName();
+        synchronized (extensionElements) {
+            List<ExtensionElement> list = extensionElements.getAll(key);
             boolean removed = list.remove(extension);
             if (removed) {
                 return extension;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XmlEnvironment.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XmlEnvironment.java
index da69cb240..0e713a04c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XmlEnvironment.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XmlEnvironment.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smack.packet;
 import org.jivesoftware.smack.util.ParserUtils;
 import org.jivesoftware.smack.util.StringUtils;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public class XmlEnvironment {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java
index 4b9f77acf..cceaf4216 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/parsing/StandardExtensionElementProvider.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015 Florian Schmaus.
+ * Copyright 2015-2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
 import org.jivesoftware.smack.util.StringUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * The parser for {@link StandardExtensionElement}s.
@@ -47,7 +47,7 @@ public class StandardExtensionElementProvider extends ExtensionElementProvider<S
         String name = parser.getName();
         String namespace = parser.getNamespace();
         StandardExtensionElement.Builder builder = StandardExtensionElement.builder(name, namespace);
-        final int namespaceCount = parser.getNamespaceCount(initialDepth);
+        final int namespaceCount = parser.getNamespaceCount();
         final int attributeCount = parser.getAttributeCount();
         final Map<String, String> attributes = new LinkedHashMap<>(namespaceCount + attributeCount);
         for (int i = 0; i < namespaceCount; i++) {
@@ -77,19 +77,22 @@ public class StandardExtensionElementProvider extends ExtensionElementProvider<S
         builder.addAttributes(attributes);
 
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 builder.addElement(parse(parser, parser.getDepth(), xmlEnvironment));
                 break;
-            case XmlPullParser.TEXT:
+            case TEXT_CHARACTERS:
                 builder.setText(parser.getText());
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (initialDepth == parser.getDepth()) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java
index 0a62a117e..4bd8e9704 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/BindIQProvider.java
@@ -20,12 +20,12 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.Bind;
 import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityFullJid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class BindIQProvider extends IQProvider<Bind> {
 
@@ -34,9 +34,9 @@ public class BindIQProvider extends IQProvider<Bind> {
         String name;
         Bind bind = null;
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 name = parser.getName();
                 switch (name) {
                 case "resource":
@@ -49,11 +49,14 @@ public class BindIQProvider extends IQProvider<Bind> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return bind;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/BodyElementProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/BodyElementProvider.java
index ad6cefdaf..df85d067c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/BodyElementProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/BodyElementProvider.java
@@ -24,8 +24,8 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.util.ParserUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class BodyElementProvider extends ExtensionElementProvider<Message.Body> {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java
index 6226d5d3d..f572d876d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java
@@ -27,8 +27,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  *
@@ -97,14 +97,14 @@ public abstract class EmbeddedExtensionProvider<PE extends ExtensionElement> ext
         }
 
         List<ExtensionElement> extensions = new ArrayList<>();
-        int event;
+        XmlPullParser.Event event;
         do {
             event = parser.next();
 
-            if (event == XmlPullParser.START_TAG)
+            if (event == XmlPullParser.Event.START_ELEMENT)
                 PacketParserUtils.addExtensionElement(extensions, parser, xmlEnvironment);
         }
-        while (!(event == XmlPullParser.END_TAG && parser.getDepth() == initialDepth));
+        while (!(event == XmlPullParser.Event.END_ELEMENT && parser.getDepth() == initialDepth));
 
         return createReturnExtension(name, namespace, attMap, extensions);
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java
index 3c952bbf6..a4c58f406 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/IntrospectionProvider.java
@@ -24,8 +24,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.util.ParserUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class IntrospectionProvider{
 
@@ -81,9 +81,9 @@ public class IntrospectionProvider{
         ParserUtils.assertAtStartTag(parser);
         Object object = objectClass.getConstructor().newInstance();
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 String stringValue = parser.nextText();
                 Class<?> propertyType = object.getClass().getMethod(
@@ -97,11 +97,14 @@ public class IntrospectionProvider{
                                 propertyType).invoke(object, value);
                 break;
 
-            case  XmlPullParser.END_TAG:
+            case  END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         ParserUtils.assertAtEndTag(parser);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java
index 46205fd6a..ef1a225d9 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/Provider.java
@@ -26,8 +26,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.util.ParserUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * Smack provider are the parsers used to deserialize raw XMPP into the according Java {@link Element}s.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
index c8b879306..e39f81d26 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java
@@ -26,9 +26,8 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.IQ;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
+import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 /**
  * Loads the {@link IQProvider} and {@link ExtensionElementProvider} information from a standard provider file in preparation
@@ -54,12 +53,10 @@ public class ProviderFileLoader implements ProviderLoader {
     public ProviderFileLoader(InputStream providerStream, ClassLoader classLoader) {
         // Load processing providers.
         try (InputStream is = providerStream) {
-            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-            parser.setInput(is, "UTF-8");
-            int eventType = parser.getEventType();
+            XmlPullParser parser = PacketParserUtils.getParserFor(is);
+            XmlPullParser.Event eventType = parser.getEventType();
             do {
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     final String typeName = parser.getName();
 
                     try {
@@ -134,7 +131,7 @@ public class ProviderFileLoader implements ProviderLoader {
                 }
                 eventType = parser.next();
             }
-            while (eventType != XmlPullParser.END_DOCUMENT);
+            while (eventType != XmlPullParser.Event.END_DOCUMENT);
         }
         catch (Exception e) {
             LOGGER.log(Level.SEVERE, "Unknown error occurred while parsing provider file", e);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
index b2da1392f..377e6e47b 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java
@@ -22,6 +22,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.IQ;
@@ -29,8 +31,6 @@ import org.jivesoftware.smack.packet.Nonza;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmppElementUtil;
 
-import org.jxmpp.util.XmppStringUtils;
-
 /**
  * Manages providers for parsing custom XML sub-documents of XMPP packets. Two types of
  * providers exist:<ul>
@@ -112,10 +112,10 @@ import org.jxmpp.util.XmppStringUtils;
  */
 public final class ProviderManager {
 
-    private static final Map<String, ExtensionElementProvider<ExtensionElement>> extensionProviders = new ConcurrentHashMap<String, ExtensionElementProvider<ExtensionElement>>();
-    private static final Map<String, IQProvider<IQ>> iqProviders = new ConcurrentHashMap<String, IQProvider<IQ>>();
-    private static final Map<String, ExtensionElementProvider<ExtensionElement>> streamFeatureProviders = new ConcurrentHashMap<String, ExtensionElementProvider<ExtensionElement>>();
-    private static final Map<String, NonzaProvider<? extends Nonza>> nonzaProviders = new ConcurrentHashMap<>();
+    private static final Map<QName, ExtensionElementProvider<ExtensionElement>> extensionProviders = new ConcurrentHashMap<>();
+    private static final Map<QName, IQProvider<IQ>> iqProviders = new ConcurrentHashMap<>();
+    private static final Map<QName, ExtensionElementProvider<ExtensionElement>> streamFeatureProviders = new ConcurrentHashMap<>();
+    private static final Map<QName, NonzaProvider<? extends Nonza>> nonzaProviders = new ConcurrentHashMap<>();
 
     static {
         // Ensure that Smack is initialized by calling getVersion, so that user
@@ -168,7 +168,7 @@ public final class ProviderManager {
      * @return the IQ provider.
      */
     public static IQProvider<IQ> getIQProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         return iqProviders.get(key);
     }
 
@@ -199,7 +199,7 @@ public final class ProviderManager {
             Object provider) {
         validate(elementName, namespace);
         // First remove existing providers
-        String key = removeIQProvider(elementName, namespace);
+        QName key = removeIQProvider(elementName, namespace);
         if (provider instanceof IQProvider) {
             iqProviders.put(key, (IQProvider<IQ>) provider);
         } else {
@@ -214,10 +214,10 @@ public final class ProviderManager {
      *
      * @param elementName the XML element name.
      * @param namespace the XML namespace.
-     * @return the key of the removed IQ Provider
+     * @return the QName of the removed provider
      */
-    public static String removeIQProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+    public static QName removeIQProvider(String elementName, String namespace) {
+        QName key = getQName(elementName, namespace);
         iqProviders.remove(key);
         return key;
     }
@@ -242,7 +242,7 @@ public final class ProviderManager {
      * @return the extension provider.
      */
     public static ExtensionElementProvider<ExtensionElement> getExtensionProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         return extensionProviders.get(key);
     }
 
@@ -260,7 +260,7 @@ public final class ProviderManager {
             Object provider) {
         validate(elementName, namespace);
         // First remove existing providers
-        String key = removeExtensionProvider(elementName, namespace);
+        QName key = removeExtensionProvider(elementName, namespace);
         if (provider instanceof ExtensionElementProvider) {
             extensionProviders.put(key, (ExtensionElementProvider<ExtensionElement>) provider);
         } else {
@@ -275,10 +275,10 @@ public final class ProviderManager {
      *
      * @param elementName the XML element name.
      * @param namespace the XML namespace.
-     * @return the key of the removed stanza extension provider
+     * @return the QName of the removed stanza extension provider
      */
-    public static String removeExtensionProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+    public static QName removeExtensionProvider(String elementName, String namespace) {
+        QName key = getQName(elementName, namespace);
         extensionProviders.remove(key);
         return key;
     }
@@ -297,48 +297,48 @@ public final class ProviderManager {
     }
 
     public static ExtensionElementProvider<ExtensionElement> getStreamFeatureProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         return streamFeatureProviders.get(key);
     }
 
     public static void addStreamFeatureProvider(String elementName, String namespace, ExtensionElementProvider<ExtensionElement> provider) {
         validate(elementName, namespace);
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         streamFeatureProviders.put(key, provider);
     }
 
     public static void removeStreamFeatureProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         streamFeatureProviders.remove(key);
     }
 
     public static NonzaProvider<? extends Nonza> getNonzaProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         return getNonzaProvider(key);
     }
 
-    public static NonzaProvider<? extends Nonza> getNonzaProvider(String key) {
+    public static NonzaProvider<? extends Nonza> getNonzaProvider(QName key) {
         return nonzaProviders.get(key);
     }
 
     public static void addNonzaProvider(NonzaProvider<? extends Nonza> nonzaProvider) {
         Class<? extends Nonza> nonzaClass = nonzaProvider.getElementClass();
-        String key = XmppElementUtil.getKeyFor(nonzaClass);
+        QName key = XmppElementUtil.getQNameFor(nonzaClass);
         nonzaProviders.put(key, nonzaProvider);
     }
 
     public static void removeNonzaProvider(Class<? extends Nonza> nonzaClass) {
-        String key = XmppElementUtil.getKeyFor(nonzaClass);
+        QName key = XmppElementUtil.getQNameFor(nonzaClass);
         nonzaProviders.remove(key);
     }
 
     public static void removeNonzaProvider(String elementName, String namespace) {
-        String key = getKey(elementName, namespace);
+        QName key = getQName(elementName, namespace);
         nonzaProviders.remove(key);
     }
 
-    private static String getKey(String elementName, String namespace) {
-        return XmppStringUtils.generateKey(elementName, namespace);
+    private static QName getQName(String elementName, String namespace) {
+        return new QName(namespace, elementName);
     }
 
     private static void validate(String elementName, String namespace) {
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsFailureProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsFailureProvider.java
index 6211e6cc0..2509d89c8 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsFailureProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsFailureProvider.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smack.provider;
 import org.jivesoftware.smack.packet.TlsProceed;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public final class TlsFailureProvider extends NonzaProvider<TlsProceed> {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsProceedProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsProceedProvider.java
index 3be9f904f..f8e8b1158 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsProceedProvider.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/TlsProceedProvider.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smack.provider;
 import org.jivesoftware.smack.packet.TlsFailure;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public final class TlsProceedProvider extends NonzaProvider<TlsFailure> {
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
index cf35fb788..2c2658c99 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketConnection.java
@@ -22,8 +22,7 @@ import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-
-import org.jivesoftware.smack.util.StringUtils;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Socket factory for socks4 proxy.
@@ -73,7 +72,6 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
     of all zero bits.
     */
 
-            index = 0;
             buf[index++] = 4;
             buf[index++] = 1;
 
@@ -87,7 +85,7 @@ public class Socks4ProxySocketConnection implements ProxySocketConnection {
             }
 
             if (user != null) {
-                byte[] userBytes = user.getBytes(StringUtils.UTF8);
+                byte[] userBytes = user.getBytes(StandardCharsets.UTF_8);
                 System.arraycopy(userBytes, 0, buf, index, user.length());
                 index += user.length();
             }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
index de9cebe6f..3c8a080e6 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketConnection.java
@@ -21,10 +21,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.util.CloseableUtil;
-import org.jivesoftware.smack.util.StringUtils;
 
 /**
  * Socket factory for Socks5 proxy.
@@ -133,11 +133,11 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
                     index = 0;
                     buf[index++] = 1;
                     buf[index++] = (byte) user.length();
-                    byte[] userBytes = user.getBytes(StringUtils.UTF8);
+                    byte[] userBytes = user.getBytes(StandardCharsets.UTF_8);
                     System.arraycopy(userBytes, 0, buf, index,
                         user.length());
                     index += user.length();
-                    byte[] passwordBytes = passwd.getBytes(StringUtils.UTF8);
+                    byte[] passwordBytes = passwd.getBytes(StandardCharsets.UTF_8);
                     buf[index++] = (byte) passwordBytes.length;
                     System.arraycopy(passwordBytes, 0, buf, index,
                         passwd.length());
@@ -204,7 +204,7 @@ public class Socks5ProxySocketConnection implements ProxySocketConnection {
             buf[index++] = 1;       // CONNECT
             buf[index++] = 0;
 
-            byte[] hostb = host.getBytes(StringUtils.UTF8);
+            byte[] hostb = host.getBytes(StandardCharsets.UTF_8);
             int len = hostb.length;
             buf[index++] = 3;      // DOMAINNAME
             buf[index++] = (byte) len;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java
index be0dfc503..11d9879a3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java
@@ -31,13 +31,13 @@ public class SASLErrorException extends XMPPException {
 
     private final SASLFailure saslFailure;
     private final String mechanism;
-    private final Map<String,String> texts;
+    private final Map<String, String> texts;
 
     public SASLErrorException(String mechanism, SASLFailure saslFailure) {
         this(mechanism, saslFailure, new HashMap<String, String>());
     }
 
-    public SASLErrorException(String mechanism, SASLFailure saslFailure, Map<String,String> texts) {
+    public SASLErrorException(String mechanism, SASLFailure saslFailure, Map<String, String> texts) {
         super("SASLError using " + mechanism + ": " + saslFailure.getSASLErrorString());
         this.mechanism = mechanism;
         this.saslFailure = saslFailure;
@@ -52,7 +52,7 @@ public class SASLErrorException extends XMPPException {
         return mechanism;
     }
 
-    public Map<String,String> getTexts() {
+    public Map<String, String> getTexts() {
         return texts;
     }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
index c55e7bb3b..e8cb0e8e1 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smack.sasl.core;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.SecureRandom;
 import java.util.Collections;
@@ -114,14 +114,8 @@ public abstract class ScramMechanism extends SASLMechanism {
 
     @Override
     protected byte[] evaluateChallenge(byte[] challenge) throws SmackSaslException {
-        String challengeString;
-        try {
-            // TODO: Where is it specified that this is an UTF-8 encoded string?
-            challengeString = new String(challenge, StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        // TODO: Where is it specified that this is an UTF-8 encoded string?
+        String challengeString = new String(challenge, StandardCharsets.UTF_8);
 
         switch (state) {
         case AUTH_TEXT_SENT:
@@ -386,14 +380,9 @@ public abstract class ScramMechanism extends SASLMechanism {
      * @throws SmackSaslException if a SASL related error occurs.
      */
     private byte[] hi(String normalizedPassword, byte[] salt, int iterations) throws SmackSaslException {
-        byte[] key;
-        try {
-            // According to RFC 5802 § 2.2, the resulting string of the normalization is also in UTF-8.
-            key = normalizedPassword.getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError();
-        }
+        // According to RFC 5802 § 2.2, the resulting string of the normalization is also in UTF-8.
+        byte[] key = normalizedPassword.getBytes(StandardCharsets.UTF_8);
+
         // U1 := HMAC(str, salt + INT(1))
         byte[] u = hmac(key, ByteUtils.concat(salt, ONE));
         byte[] res = u.clone();
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java
index 1288b8f18..d70ed77c9 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014-2018 Florian Schmaus
+ * Copyright 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,7 +110,7 @@ public class ArrayBlockingQueueWithShutdown<E> extends AbstractQueue<E> implemen
 
     private void checkNotShutdown() throws InterruptedException {
         if (isShutdown) {
-            throw new InterruptedException();
+            throw new InterruptedException("Queue was already shut down");
         }
     }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/CallbackRecipient.java b/smack-core/src/main/java/org/jivesoftware/smack/util/CallbackRecipient.java
index 18d631361..b325f07b1 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/CallbackRecipient.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/CallbackRecipient.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smack.util;
 
-public interface CallbackRecipient<V,E> {
+public interface CallbackRecipient<V, E> {
 
     CallbackRecipient<V, E> onSuccess(SuccessCallback<V> successCallback);
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/CloseableUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/CloseableUtil.java
index e76766d3c..a524c853b 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/CloseableUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/CloseableUtil.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus
+ * Copyright 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,10 @@ import java.util.logging.Logger;
 
 public class CloseableUtil {
 
+    public static void maybeClose(Closeable closable) {
+        maybeClose(closable, null);
+    }
+
     public static void maybeClose(Closeable closable, Logger logger) {
         if (closable == null) {
             return;
@@ -31,7 +35,9 @@ public class CloseableUtil {
         try {
             closable.close();
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Could not close " + closable, e);
+            if (logger != null) {
+                logger.log(Level.WARNING, "Could not close " + closable, e);
+            }
         }
     }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/CollectionUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/CollectionUtil.java
index 6da004405..a5838083a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/CollectionUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/CollectionUtil.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015-2018 Florian Schmaus
+ * Copyright 2015-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,4 +49,10 @@ public class CollectionUtil {
     public interface Predicate<T> {
         boolean test(T t);
     }
+
+    public static <T> ArrayList<T> newListWith(Collection<? extends T> collection) {
+        ArrayList<T> arrayList = new ArrayList<>(collection.size());
+        arrayList.addAll(collection);
+        return arrayList;
+    }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/EqualsUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/EqualsUtil.java
new file mode 100644
index 000000000..9d786cc8f
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/EqualsUtil.java
@@ -0,0 +1,243 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util;
+
+public final class EqualsUtil {
+
+    private EqualsUtil() {
+    }
+
+    public static <T> boolean equals(T thisObject, Object other, EqualsComperator<T> equalsComperator) {
+        if (other == null) {
+            return false;
+        }
+        if (thisObject == other) {
+            return true;
+        }
+        @SuppressWarnings("unchecked")
+        Class<T> thisObjectClass = (Class<T>) thisObject.getClass();
+        if (thisObjectClass != other.getClass()) {
+            return false;
+        }
+
+        EqualsUtil.Builder equalsBuilder = new EqualsUtil.Builder();
+
+        equalsComperator.compare(equalsBuilder, thisObjectClass.cast(other));
+
+        return equalsBuilder.isEquals;
+    }
+
+    @FunctionalInterface
+    public interface EqualsComperator<T> {
+        void compare(EqualsUtil.Builder equalsBuilder, T other);
+    }
+
+    public static final class Builder {
+        private boolean isEquals = true;
+
+        private Builder() {
+        }
+
+        private void nullSafeCompare(Object left, Object right, Runnable runnable) {
+            if (!isEquals) {
+                return;
+            }
+
+            if (left == right) {
+                return;
+            }
+
+            if (left == null || right == null) {
+                isEquals = false;
+                return;
+            }
+
+            runnable.run();
+        }
+
+        public <O> Builder append(O left, O right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            if (left == right) {
+                return this;
+            }
+
+            if (left == null || right == null) {
+                isEquals = false;
+                return this;
+            }
+
+            isEquals = left.equals(right);
+            return this;
+        }
+
+        public Builder append(boolean left, boolean right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            isEquals = left == right;
+            return this;
+        }
+
+        public Builder append(boolean[] left, boolean[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+
+        public Builder append(byte left, byte right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            isEquals = left == right;
+            return this;
+        }
+
+        public Builder append(byte[] left, byte[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+
+        public Builder append(char left, char right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            isEquals = left == right;
+            return this;
+        }
+
+        public Builder append(char[] left, char[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+
+        public Builder append(double left, double right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            return append(Double.doubleToLongBits(left), Double.doubleToLongBits(right));
+        }
+
+        public Builder append(double[] left, double[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+
+        public Builder append(float left, float right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            return append(Float.floatToIntBits(left), Float.floatToIntBits(right));
+        }
+
+        public Builder append(float[] left, float[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+
+        public Builder append(int left, int right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            isEquals = left == right;
+            return this;
+        }
+
+        public Builder append(int[] left, int[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+
+        public Builder append(long left, long right) {
+            if (!isEquals) {
+                return this;
+            }
+
+            isEquals = left == right;
+            return this;
+        }
+
+        public Builder append(long[] left, long[] right) {
+            nullSafeCompare(left, right, () -> {
+                if (left.length != right.length) {
+                    isEquals = false;
+                    return;
+                }
+                for (int i = 0; i < left.length && isEquals; i++) {
+                    append(left[i], right[i]);
+                }
+            });
+            return this;
+        }
+    }
+
+}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java b/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
index 00348c3c5..81197f729 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class EventManger<K, R, E extends Exception> {
 
-    private final Map<K,Reference<R>> events = new ConcurrentHashMap<>();
+    private final Map<K, Reference<R>> events = new ConcurrentHashMap<>();
 
     /**
      * Perform an action and wait for an event.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java
index 8fc4bcd7e..8d246c1c4 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java
@@ -30,6 +30,7 @@ import java.io.Reader;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -90,7 +91,7 @@ public final class FileUtils {
     public static boolean addLines(String uriString, Set<String> set) throws MalformedURLException, IOException {
         URI uri = URI.create(uriString);
         InputStream is = getStreamForUri(uri, null);
-        InputStreamReader sr = new InputStreamReader(is, StringUtils.UTF8);
+        InputStreamReader sr = new InputStreamReader(is, StandardCharsets.UTF_8);
         BufferedReader br = new BufferedReader(sr);
         try {
             String line;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/HashCode.java b/smack-core/src/main/java/org/jivesoftware/smack/util/HashCode.java
new file mode 100644
index 000000000..79065850d
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/HashCode.java
@@ -0,0 +1,211 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util;
+
+public class HashCode {
+
+    private static final int MULTIPLIER_VALUE = 37;
+
+    public static class Cache {
+        private boolean calculated;
+        private int hashcode;
+
+        public int getHashCode(Calculator hashCodeCalculator) {
+            if (calculated) {
+                return hashcode;
+            }
+
+            HashCode.Builder hashCodeBuilder = new HashCode.Builder();
+            hashCodeCalculator.calculateHash(hashCodeBuilder);
+
+            calculated = true;
+            hashcode = hashCodeBuilder.hashcode;
+
+            return hashcode;
+        }
+
+    }
+
+    @FunctionalInterface
+    public interface Calculator {
+        void calculateHash(HashCode.Builder hashCodeBuilder);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private int hashcode = 17;
+
+        private void applyHash() {
+            applyHash(0);
+        }
+
+        private void applyHash(int hash) {
+            hashcode = MULTIPLIER_VALUE * hashcode + hash;
+        }
+
+        public Builder append(Object object) {
+            if (object == null) {
+                applyHash();
+                return this;
+            }
+
+            if (object.getClass().isArray()) {
+                if (object instanceof int[]) {
+                    append((int[]) object);
+                } else if (object instanceof long[]) {
+                    append((long[]) object);
+                } else if (object instanceof boolean[]) {
+                    append((boolean[]) object);
+                } else if (object instanceof double[]) {
+                    append((double[]) object);
+                } else if (object instanceof float[]) {
+                    append((float[]) object);
+                } else if (object instanceof short[]) {
+                    append((short[]) object);
+                } else if (object instanceof char[]) {
+                    append((char[]) object);
+                } else if (object instanceof byte[]) {
+                    append((byte[]) object);
+                } else {
+                    append((Object[]) object);
+                }
+            }
+            applyHash(object.hashCode());
+            return this;
+        }
+
+        public Builder append(boolean value) {
+            applyHash(value ? 0 : 1);
+            return this;
+        }
+
+        public Builder append(boolean[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (boolean bool : array) {
+                append(bool);
+            }
+            return this;
+        }
+
+        public Builder append(byte value) {
+            applyHash(value);
+            return this;
+        }
+
+        public Builder append(byte[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (byte b : array) {
+                append(b);
+            }
+            return this;
+        }
+
+        public Builder append(char value) {
+            applyHash(value);
+            return this;
+        }
+
+        public Builder append(char[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (char c : array) {
+                append(c);
+            }
+            return this;
+        }
+
+        public Builder append(double value) {
+            return append(Double.doubleToLongBits(value));
+        }
+
+        public Builder append(double[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (double d : array) {
+                append(d);
+            }
+            return this;
+        }
+
+        public Builder append(float value) {
+            return append(Float.floatToIntBits(value));
+        }
+
+        public Builder append(float[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (float f : array) {
+                append(f);
+            }
+            return this;
+        }
+
+        public Builder append(long value) {
+            applyHash((int) (value ^ (value >>> 32)));
+            return this;
+        }
+
+        public Builder append(long[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (long l : array) {
+                append(l);
+            }
+            return this;
+        }
+
+        public Builder append(Object[] array) {
+            if (array == null) {
+                applyHash();
+                return this;
+            }
+
+            for (Object element : array) {
+                append(element);
+            }
+            return this;
+        }
+
+        public int build() {
+            return hashcode;
+        }
+    }
+
+}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/InternetAddress.java b/smack-core/src/main/java/org/jivesoftware/smack/util/InternetAddress.java
new file mode 100644
index 000000000..0fca8182f
--- /dev/null
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/InternetAddress.java
@@ -0,0 +1,213 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.util;
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.minidns.dnslabel.DnsLabel;
+import org.minidns.dnsname.DnsName;
+import org.minidns.dnsname.InvalidDnsNameException;
+import org.minidns.util.InetAddressUtil;
+
+/**
+ * An internet address, can be given as IP or as DNS name.
+ * <p>
+ * This type is meant for strings that hold an internet address. The original string used to construct this type is
+ * stored and returning in the {@link #toString()} method.
+ * </p>
+ *
+ * @since 4.4.0
+ */
+public abstract class InternetAddress implements CharSequence {
+
+    protected final String originalString;
+
+    protected InternetAddress(String originalString) {
+        this.originalString = Objects.requireNonNull(originalString, "The 'originalString' argument must not be null");
+    }
+
+    public abstract InetAddress asInetAddress() throws UnknownHostException;
+
+    @Override
+    public String toString() {
+        return originalString;
+    }
+
+    @Override
+    public int length() {
+        return originalString.length();
+    }
+
+    @Override
+    public char charAt(int index) {
+        return originalString.charAt(index);
+    }
+
+    @Override
+    public CharSequence subSequence(int start, int end) {
+        return originalString.subSequence(start, end);
+    }
+
+    public static InternetAddress from(String address) {
+        final InternetAddress internetAddress;
+        if (InetAddressUtil.isIpV4Address(address)) {
+            internetAddress = new InternetAddress.Ipv4(address);
+        } else if (InetAddressUtil.isIpV6Address(address)) {
+            internetAddress = new InternetAddress.Ipv6(address);
+        } else if (address.contains(".")) {
+            InternetAddress domainNameInternetAddress;
+            try {
+                DnsName dnsName = DnsName.from(address);
+                domainNameInternetAddress = new InternetAddress.DomainName(address, dnsName);
+            } catch (InvalidDnsNameException e) {
+                domainNameInternetAddress = new InternetAddress.InvalidDomainName(address, e);
+            }
+            internetAddress = domainNameInternetAddress;
+        } else {
+            DnsLabel dnsLabel = DnsLabel.from(address);
+            internetAddress = new InternetAddress.DomainNameLabel(address, dnsLabel);
+        }
+        return internetAddress;
+    }
+
+    public static InternetAddress from(InetAddress inetAddress) {
+        if (inetAddress instanceof Inet4Address) {
+            return new InternetAddress.Ipv4(inetAddress.getHostAddress(), (Inet4Address) inetAddress);
+        } else if (inetAddress instanceof Inet6Address) {
+            return new InternetAddress.Ipv6(inetAddress.getHostAddress(), (Inet6Address) inetAddress);
+        } else {
+            throw new IllegalArgumentException("Unknown type " + inetAddress.getClass() + " of " + inetAddress);
+        }
+    }
+
+    private static class InetAddressInternetAddress extends InternetAddress {
+        private final InetAddress inetAddress;
+
+        protected InetAddressInternetAddress(String originalString, InetAddress inetAddress) {
+            super(originalString);
+            this.inetAddress = inetAddress;
+        }
+
+        @Override
+        public InetAddress asInetAddress() {
+            return inetAddress;
+        }
+    }
+
+    public static final class Ipv4 extends InetAddressInternetAddress {
+
+        private final Inet4Address inet4Address;
+
+        private Ipv4(String originalString) {
+            this(originalString, InetAddressUtil.ipv4From(originalString));
+        }
+
+        private Ipv4(String originalString, Inet4Address inet4Address) {
+            super(originalString, inet4Address);
+            this.inet4Address = inet4Address;
+        }
+
+        public Inet4Address getInet4Address() {
+            return inet4Address;
+        }
+    }
+
+    public static final class Ipv6 extends InetAddressInternetAddress {
+
+        private Inet6Address inet6Address;
+
+        private Ipv6(String originalString) {
+            this(originalString, InetAddressUtil.ipv6From(originalString));
+        }
+
+        private Ipv6(String originalString, Inet6Address inet6Address) {
+            super(originalString, inet6Address);
+            this.inet6Address = inet6Address;
+        }
+
+        public Inet6Address getInet6Address() {
+            return inet6Address;
+        }
+    }
+
+    private static class NonNumericInternetAddress extends InternetAddress {
+        private boolean attemptedToResolveInetAddress;
+        private InetAddress inetAddress;
+
+        protected NonNumericInternetAddress(String originalString) {
+            super(originalString);
+        }
+
+        @Override
+        public InetAddress asInetAddress() throws UnknownHostException {
+            if (inetAddress != null || attemptedToResolveInetAddress) {
+                return inetAddress;
+            }
+
+            attemptedToResolveInetAddress = true;
+            inetAddress = InetAddress.getByName(originalString);
+
+            return inetAddress;
+        }
+    }
+
+    public static final class DomainName extends NonNumericInternetAddress {
+
+        private final DnsName dnsName;
+
+        private DomainName(String originalString, DnsName dnsName) {
+            super(originalString);
+            this.dnsName = dnsName;
+        }
+
+        public DnsName getDnsName() {
+            return dnsName;
+        }
+
+    }
+
+    public static final class DomainNameLabel extends NonNumericInternetAddress {
+
+        private final DnsLabel dnsLabel;
+
+        private DomainNameLabel(String originalString, DnsLabel dnsLabel) {
+            super(originalString);
+            this.dnsLabel = dnsLabel;
+        }
+
+        public DnsLabel getDnsLabel() {
+            return dnsLabel;
+        }
+    }
+
+    public static final class InvalidDomainName extends NonNumericInternetAddress {
+
+        private final InvalidDnsNameException invalidDnsNameException;
+
+        private InvalidDomainName(String originalString, InvalidDnsNameException invalidDnsNameException) {
+            super(originalString);
+            this.invalidDnsNameException = invalidDnsNameException;
+        }
+
+        public InvalidDnsNameException getInvalidDnsNameException() {
+            return invalidDnsNameException;
+        }
+    }
+}
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
index 3f2c2ccbb..0908106c2 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
@@ -22,6 +22,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 /**
@@ -33,7 +34,7 @@ import java.util.Set;
  * @param <K> the type of the keys the map uses.
  * @param <V> the type of the values the map uses.
  */
-public class MultiMap<K,V> {
+public class MultiMap<K, V> {
 
     /**
      * The constant value {@value}.
@@ -57,7 +58,11 @@ public class MultiMap<K,V> {
      * @param size the initial capacity.
      */
     public MultiMap(int size) {
-        map = new LinkedHashMap<>(size);
+        this(new LinkedHashMap<>(size));
+    }
+
+    private MultiMap(Map<K, List<V>> map) {
+        this.map = map;
     }
 
     public int size() {
@@ -72,11 +77,11 @@ public class MultiMap<K,V> {
         return map.isEmpty();
     }
 
-    public boolean containsKey(Object key) {
+    public boolean containsKey(K key) {
         return map.containsKey(key);
     }
 
-    public boolean containsValue(Object value) {
+    public boolean containsValue(V value) {
         for (List<V> list : map.values()) {
             if (list.contains(value)) {
                 return true;
@@ -91,7 +96,7 @@ public class MultiMap<K,V> {
      * @param key
      * @return the first value or null.
      */
-    public V getFirst(Object key) {
+    public V getFirst(K key) {
         List<V> res = getAll(key);
         if (res.isEmpty()) {
             return null;
@@ -109,7 +114,7 @@ public class MultiMap<K,V> {
      * @param key
      * @return all values for the given key.
      */
-    public List<V> getAll(Object key) {
+    public List<V> getAll(K key) {
         List<V> res = map.get(key);
         if (res == null) {
             res = Collections.emptyList();
@@ -138,7 +143,7 @@ public class MultiMap<K,V> {
      * @param key
      * @return the first value of the given key or null.
      */
-    public V remove(Object key) {
+    public V remove(K key) {
         List<V> res = map.remove(key);
         if (res == null) {
             return null;
@@ -157,7 +162,7 @@ public class MultiMap<K,V> {
      * @param value
      * @return true if the mapping was removed, false otherwise.
      */
-    public boolean removeOne(Object key, V value) {
+    public boolean removeOne(K key, V value) {
         List<V> list = map.get(key);
         if (list == null) {
             return false;
@@ -235,6 +240,18 @@ public class MultiMap<K,V> {
         return entrySet;
     }
 
+    public MultiMap<K, V> asUnmodifiableMultiMap() {
+        LinkedHashMap<K, List<V>> mapCopy = new LinkedHashMap<>(map.size());
+        for (Entry<K, List<V>> entry : map.entrySet()) {
+            K key = entry.getKey();
+            List<V> values = entry.getValue();
+
+            mapCopy.put(key, Collections.unmodifiableList(values));
+        }
+
+        return new MultiMap<K, V>(Collections.unmodifiableMap(mapCopy));
+    }
+
     private static final class SimpleMapEntry<K, V> implements Map.Entry<K, V> {
 
         private final K key;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/NumberUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/NumberUtil.java
index 8ca973370..140fff4e3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/NumberUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/NumberUtil.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2015 Florian Schmaus
+ * Copyright © 2015-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,41 @@ public class NumberUtil {
      * Checks if the given long is within the range of an unsigned 32-bit integer, the XML type "xs:unsignedInt".
      *
      * @param value
+     * @deprecated use {@link #requireUInt32(long)} instead.
      */
+    @Deprecated
+    // TODO: Remove in Smack 4.5.
     public static void checkIfInUInt32Range(long value) {
+        requireUInt32(value);
+    }
+
+    /**
+     * Checks if the given long is within the range of an unsigned 32-bit integer, the XML type "xs:unsignedInt".
+     *
+     * @param value
+     */
+    public static long requireUInt32(long value) {
         if (value < 0) {
             throw new IllegalArgumentException("unsigned 32-bit integers can't be negative");
         }
         if (value > ((1L << 32) - 1)) {
             throw new IllegalArgumentException("unsigned 32-bit integers can't be greater then 2^32 - 1");
         }
+        return value;
+    }
+
+    /**
+     * Checks if the given int is within the range of an unsigned 16-bit integer, the XML type "xs:unsignedShort".
+     *
+     * @param value
+     */
+    public static int requireUShort16(int value) {
+        if (value < 0) {
+            throw new IllegalArgumentException("unsigned 16-bit integers can't be negative");
+        }
+        if (value > ((1 << 16) - 1)) {
+            throw new IllegalArgumentException("unsigned 16-bit integers can't be greater than 2^16 - 1");
+        }
+        return value;
     }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/Objects.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Objects.java
index 97dec7d74..9cf7cadb3 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/Objects.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/Objects.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015-2018 Florian Schmaus
+ * Copyright 2015-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,26 @@ import java.util.Collection;
 
 public class Objects {
 
-    public static <T> T requireNonNull(T obj, String message) {
+    /**
+     * Checks that the specified object reference is not <code>null</code> and throws a customized
+     * {@link IllegalArgumentException} if it is.
+     * <p>
+     * Note that unlike <code>java.util.Objects</code>, this method throws an {@link IllegalArgumentException} instead
+     * of an {@link NullPointerException}.
+     * </p>
+     *
+     * @param <T> the type of the reference.
+     * @param obj the object reference to check for nullity.
+     * @param message detail message to be used in the event that a {@link IllegalArgumentException} is thrown.
+     * @return <code>obj</code> if not null.
+     * @throws IllegalArgumentException in case <code>obj</code> is <code>null</code>.
+     */
+    public static <T> T requireNonNull(T obj, String message) throws IllegalArgumentException {
         if (obj == null) {
-            throw new NullPointerException(message);
+            if (message == null) {
+                message = "Can not provide null argument";
+            }
+            throw new IllegalArgumentException(message);
         }
         return obj;
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index dd065fe92..178932554 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -17,18 +17,19 @@
 package org.jivesoftware.smack.util;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.compress.packet.Compress;
 import org.jivesoftware.smack.packet.EmptyResultIQ;
 import org.jivesoftware.smack.packet.ErrorIQ;
@@ -49,11 +50,12 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure;
+import org.jivesoftware.smack.xml.SmackXmlParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
+import org.jxmpp.stringprep.XmppStringprepException;
 
 /**
  * Utility class that helps to parse packets. Any parsing packets method that must be shared
@@ -64,51 +66,22 @@ import org.xmlpull.v1.XmlPullParserFactory;
 public class PacketParserUtils {
     private static final Logger LOGGER = Logger.getLogger(PacketParserUtils.class.getName());
 
-    public static final String FEATURE_XML_ROUNDTRIP = "http://xmlpull.org/v1/doc/features.html#xml-roundtrip";
-
-    private static final XmlPullParserFactory XML_PULL_PARSER_FACTORY;
-
-    /**
-     * True if the XmlPullParser supports the XML_ROUNDTRIP feature.
-     */
-    public static final boolean XML_PULL_PARSER_SUPPORTS_ROUNDTRIP;
-
-    static {
-        // Ensure that Smack is initialized.
-        SmackConfiguration.getVersion();
-
-        XmlPullParser xmlPullParser;
-        boolean roundtrip = false;
-        try {
-            XML_PULL_PARSER_FACTORY = XmlPullParserFactory.newInstance();
-            xmlPullParser = XML_PULL_PARSER_FACTORY.newPullParser();
-            try {
-                xmlPullParser.setFeature(FEATURE_XML_ROUNDTRIP, true);
-                // We could successfully set the feature
-                roundtrip = true;
-            } catch (XmlPullParserException e) {
-                // Doesn't matter if FEATURE_XML_ROUNDTRIP isn't available
-                LOGGER.log(Level.FINEST, "XmlPullParser does not support XML_ROUNDTRIP", e);
-            }
-        }
-        catch (XmlPullParserException e) {
-            // Something really bad happened
-            throw new AssertionError(e);
-        }
-        XML_PULL_PARSER_SUPPORTS_ROUNDTRIP = roundtrip;
-    }
-
     // TODO: Rename argument name from 'stanza' to 'element'.
     public static XmlPullParser getParserFor(String stanza) throws XmlPullParserException, IOException {
         return getParserFor(new StringReader(stanza));
     }
 
+    public static XmlPullParser getParserFor(InputStream inputStream) throws XmlPullParserException {
+        InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+        return SmackXmlParser.newXmlParser(inputStreamReader);
+    }
+
     public static XmlPullParser getParserFor(Reader reader) throws XmlPullParserException, IOException {
-        XmlPullParser parser = newXmppParser(reader);
+        XmlPullParser parser = SmackXmlParser.newXmlParser(reader);
         // Wind the parser forward to the first start tag
-        int event = parser.getEventType();
-        while (event != XmlPullParser.START_TAG) {
-            if (event == XmlPullParser.END_DOCUMENT) {
+        XmlPullParser.Event event = parser.getEventType();
+        while (event != XmlPullParser.Event.START_ELEMENT) {
+            if (event == XmlPullParser.Event.END_DOCUMENT) {
                 throw new IllegalArgumentException("Document contains no start tag");
             }
             event = parser.next();
@@ -116,28 +89,8 @@ public class PacketParserUtils {
         return parser;
     }
 
-    public static XmlPullParser getParserFor(String stanza, String startTag)
-                    throws XmlPullParserException, IOException {
-        XmlPullParser parser = getParserFor(stanza);
-
-        while (true) {
-            int event = parser.getEventType();
-            String name = parser.getName();
-            if (event == XmlPullParser.START_TAG && name.equals(startTag)) {
-                break;
-            }
-            else if (event == XmlPullParser.END_DOCUMENT) {
-                throw new IllegalArgumentException("Could not find start tag '" + startTag
-                                + "' in stanza: " + stanza);
-            }
-            parser.next();
-        }
-
-        return parser;
-    }
-
     @SuppressWarnings("unchecked")
-    public static <S extends Stanza> S parseStanza(String stanza) throws Exception {
+    public static <S extends Stanza> S parseStanza(String stanza) throws XmlPullParserException, SmackParsingException, IOException {
         return (S) parseStanza(getParserFor(stanza), null);
     }
 
@@ -149,9 +102,11 @@ public class PacketParserUtils {
      * @param parser
      * @param outerXmlEnvironment the outer XML environment (optional).
      * @return a stanza which is either a Message, IQ or Presence.
-     * @throws Exception
+     * @throws XmlPullParserException
+     * @throws SmackParsingException
+     * @throws IOException
      */
-    public static Stanza parseStanza(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws Exception {
+    public static Stanza parseStanza(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, SmackParsingException, IOException {
         ParserUtils.assertAtStartTag(parser);
         final String name = parser.getName();
         switch (name) {
@@ -166,53 +121,6 @@ public class PacketParserUtils {
         }
     }
 
-    /**
-     * Creates a new XmlPullParser suitable for parsing XMPP. This means in particular that
-     * FEATURE_PROCESS_NAMESPACES is enabled.
-     * <p>
-     * Note that not all XmlPullParser implementations will return a String on
-     * <code>getText()</code> if the parser is on START_TAG or END_TAG. So you must not rely on this
-     * behavior when using the parser.
-     * </p>
-     *
-     * @return A suitable XmlPullParser for XMPP parsing
-     * @throws XmlPullParserException
-     */
-    public static XmlPullParser newXmppParser() throws XmlPullParserException {
-        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        if (XML_PULL_PARSER_SUPPORTS_ROUNDTRIP) {
-            try {
-                parser.setFeature(FEATURE_XML_ROUNDTRIP, true);
-            }
-            catch (XmlPullParserException e) {
-                LOGGER.log(Level.SEVERE,
-                                "XmlPullParser does not support XML_ROUNDTRIP, although it was first determined to be supported",
-                                e);
-            }
-        }
-        return parser;
-    }
-
-    /**
-     * Creates a new XmlPullParser suitable for parsing XMPP. This means in particular that
-     * FEATURE_PROCESS_NAMESPACES is enabled.
-     * <p>
-     * Note that not all XmlPullParser implementations will return a String on
-     * <code>getText()</code> if the parser is on START_TAG or END_TAG. So you must not rely on this
-     * behavior when using the parser.
-     * </p>
-     *
-     * @param reader
-     * @return A suitable XmlPullParser for XMPP parsing
-     * @throws XmlPullParserException
-     */
-    public static XmlPullParser newXmppParser(Reader reader) throws XmlPullParserException {
-        XmlPullParser parser = newXmppParser();
-        parser.setInput(reader);
-        return parser;
-    }
-
     public static Message parseMessage(XmlPullParser parser) throws XmlPullParserException, IOException, SmackParsingException {
         return parseMessage(parser, null);
     }
@@ -249,9 +157,9 @@ public class PacketParserUtils {
         // in arbitrary sub-elements.
         String thread = null;
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (elementName) {
@@ -276,11 +184,12 @@ public class PacketParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default: // fall out
             }
         }
 
@@ -295,9 +204,9 @@ public class PacketParserUtils {
 
     /**
      * Returns the textual content of an element as String. After this method returns the parser
-     * position will be END_TAG, following the established pull parser calling convention.
+     * position will be END_ELEMENT, following the established pull parser calling convention.
      * <p>
-     * The parser must be positioned on a START_TAG of an element which MUST NOT contain Mixed
+     * The parser must be positioned on a START_ELEMENT of an element which MUST NOT contain Mixed
      * Content (as defined in XML 3.2.2), or else an XmlPullParserException will be thrown.
      * </p>
      * This method is used for the parts where the XMPP specification requires elements that contain
@@ -309,41 +218,36 @@ public class PacketParserUtils {
      * @throws IOException
      */
     public static String parseElementText(XmlPullParser parser) throws XmlPullParserException, IOException {
-        assert (parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.START_ELEMENT);
         String res;
-        if (parser.isEmptyElementTag()) {
-            res = "";
-        }
-        else {
-            // Advance to the text of the Element
-            int event = parser.next();
-            if (event != XmlPullParser.TEXT) {
-                if (event == XmlPullParser.END_TAG) {
-                    // Assume this is the end tag of the start tag at the
-                    // beginning of this method. Typical examples where this
-                    // happens are body elements containing the empty string,
-                    // ie. <body></body>, which appears to be valid XMPP, or a
-                    // least it's not explicitly forbidden by RFC 6121 5.2.3
-                    return "";
-                } else {
-                    throw new XmlPullParserException(
-                                    "Non-empty element tag not followed by text, while Mixed Content (XML 3.2.2) is disallowed");
-                }
-            }
-            res = parser.getText();
-            event = parser.next();
-            if (event != XmlPullParser.END_TAG) {
+        // Advance to the text of the Element
+        XmlPullParser.Event event = parser.next();
+        if (event != XmlPullParser.Event.TEXT_CHARACTERS) {
+            if (event == XmlPullParser.Event.END_ELEMENT) {
+                // Assume this is the end tag of the start tag at the
+                // beginning of this method. Typical examples where this
+                // happens are body elements containing the empty string,
+                // ie. <body></body>, which appears to be valid XMPP, or a
+                // least it's not explicitly forbidden by RFC 6121 5.2.3
+                return "";
+            } else {
                 throw new XmlPullParserException(
-                                "Non-empty element tag contains child-elements, while Mixed Content (XML 3.2.2) is disallowed");
+                                "Non-empty element tag not followed by text, while Mixed Content (XML 3.2.2) is disallowed");
             }
         }
+        res = parser.getText();
+        event = parser.next();
+        if (event != XmlPullParser.Event.END_ELEMENT) {
+            throw new XmlPullParserException(
+                            "Non-empty element tag contains child-elements, while Mixed Content (XML 3.2.2) is disallowed");
+        }
         return res;
     }
 
     /**
      * Returns the current element as string.
      * <p>
-     * The parser must be positioned on START_TAG.
+     * The parser must be positioned on START_ELEMENT.
      * </p>
      * Note that only the outermost namespace attributes ("xmlns") will be returned, not nested ones.
      *
@@ -359,37 +263,10 @@ public class PacketParserUtils {
     public static CharSequence parseElement(XmlPullParser parser,
                     boolean fullNamespaces) throws XmlPullParserException,
                     IOException {
-        assert (parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.START_ELEMENT);
         return parseContentDepth(parser, parser.getDepth(), fullNamespaces);
     }
 
-    /**
-     * Returns the content of a element.
-     * <p>
-     * The parser must be positioned on the START_TAG of the element which content is going to get
-     * returned. If the current element is the empty element, then the empty string is returned. If
-     * it is a element which contains just text, then just the text is returned. If it contains
-     * nested elements (and text), then everything from the current opening tag to the corresponding
-     * closing tag of the same depth is returned as String.
-     * </p>
-     * Note that only the outermost namespace attributes ("xmlns") will be returned, not nested ones.
-     *
-     * @param parser the XML pull parser
-     * @return the content of a tag
-     * @throws XmlPullParserException if parser encounters invalid XML
-     * @throws IOException if an IO error occurs
-     */
-    public static CharSequence parseContent(XmlPullParser parser)
-                    throws XmlPullParserException, IOException {
-        assert (parser.getEventType() == XmlPullParser.START_TAG);
-        if (parser.isEmptyElementTag()) {
-            return "";
-        }
-        // Advance the parser, since we want to parse the content of the current element
-        parser.next();
-        return parseContentDepth(parser, parser.getDepth(), false);
-    }
-
     public static CharSequence parseContentDepth(XmlPullParser parser, int depth)
                     throws XmlPullParserException, IOException {
         return parseContentDepth(parser, depth, false);
@@ -402,7 +279,7 @@ public class PacketParserUtils {
      * parent elements will be added to child elements that don't define a different namespace.
      * <p>
      * This method is able to parse the content with MX- and KXmlParser. KXmlParser does not support
-     * xml-roundtrip. i.e. return a String on getText() on START_TAG and END_TAG. We check for the
+     * xml-roundtrip. i.e. return a String on getText() on START_ELEMENT and END_ELEMENT. We check for the
      * XML_ROUNDTRIP feature. If it's not found we are required to work around this limitation, which
      * results in only partial support for XML namespaces ("xmlns"): Only the outermost namespace of
      * elements will be included in the resulting String, if <code>fullNamespaces</code> is set to false.
@@ -419,7 +296,7 @@ public class PacketParserUtils {
      * @throws IOException
      */
     public static CharSequence parseContentDepth(XmlPullParser parser, int depth, boolean fullNamespaces) throws XmlPullParserException, IOException {
-        if (parser.getFeature(FEATURE_XML_ROUNDTRIP)) {
+        if (parser.supportsRoundtrip()) {
             return parseContentDepthWithRoundtrip(parser, depth, fullNamespaces);
         } else {
             return parseContentDepthWithoutRoundtrip(parser, depth, fullNamespaces);
@@ -429,15 +306,21 @@ public class PacketParserUtils {
     private static CharSequence parseContentDepthWithoutRoundtrip(XmlPullParser parser, int depth,
                     boolean fullNamespaces) throws XmlPullParserException, IOException {
         XmlStringBuilder xml = new XmlStringBuilder();
-        int event = parser.getEventType();
-        boolean isEmptyElement = false;
+        XmlPullParser.Event event = parser.getEventType();
         // XmlPullParser reports namespaces in nested elements even if *only* the outer ones defines
         // it. This 'flag' ensures that when a namespace is set for an element, it won't be set again
         // in a nested element. It's an ugly workaround that has the potential to break things.
         String namespaceElement = null;
+        boolean startElementJustSeen = false;
         outerloop: while (true) {
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
+                if (startElementJustSeen) {
+                    xml.rightAngleBracket();
+                }
+                else {
+                    startElementJustSeen = true;
+                }
                 xml.halfOpenElement(parser.getName());
                 if (namespaceElement == null || fullNamespaces) {
                     String namespace = parser.getNamespace();
@@ -449,18 +332,11 @@ public class PacketParserUtils {
                 for (int i = 0; i < parser.getAttributeCount(); i++) {
                     xml.attribute(parser.getAttributeName(i), parser.getAttributeValue(i));
                 }
-                if (parser.isEmptyElementTag()) {
-                    xml.closeEmptyElement();
-                    isEmptyElement = true;
-                }
-                else {
-                    xml.rightAngleBracket();
-                }
                 break;
-            case XmlPullParser.END_TAG:
-                if (isEmptyElement) {
-                    // Do nothing as the element was already closed, just reset the flag
-                    isEmptyElement = false;
+            case END_ELEMENT:
+                if (startElementJustSeen) {
+                    xml.closeEmptyElement();
+                    startElementJustSeen = false;
                 }
                 else {
                     xml.closeElement(parser.getName());
@@ -474,31 +350,58 @@ public class PacketParserUtils {
                     break outerloop;
                 }
                 break;
-            case XmlPullParser.TEXT:
+            case TEXT_CHARACTERS:
+                if (startElementJustSeen) {
+                    startElementJustSeen = false;
+                    xml.rightAngleBracket();
+                }
                 xml.escape(parser.getText());
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
             event = parser.next();
         }
         return xml;
     }
 
+    @SuppressWarnings("UnusedVariable")
     private static CharSequence parseContentDepthWithRoundtrip(XmlPullParser parser, int depth, boolean fullNamespaces)
                     throws XmlPullParserException, IOException {
-        StringBuilder sb = new StringBuilder();
-        int event = parser.getEventType();
+        XmlStringBuilder sb = new XmlStringBuilder();
+        XmlPullParser.Event event = parser.getEventType();
+        boolean startElementJustSeen = false;
         outerloop: while (true) {
-            // Only append the text if the parser is not on on an empty element' start tag. Empty elements are reported
-            // twice, so in order to prevent duplication we only add their text when we are on their end tag.
-            if (!(event == XmlPullParser.START_TAG && parser.isEmptyElementTag())) {
+            switch (event) {
+            case START_ELEMENT:
+                if (startElementJustSeen) {
+                    sb.rightAngleBracket();
+                }
+                startElementJustSeen = true;
+                break;
+            case END_ELEMENT:
+                boolean isEmptyElement = false;
+                if (startElementJustSeen) {
+                    isEmptyElement = true;
+                    startElementJustSeen = false;
+                }
+                if (!isEmptyElement) {
+                    String text = parser.getText();
+                    sb.append(text);
+                }
+                if (parser.getDepth() <= depth) {
+                    break outerloop;
+                }
+                break;
+            default:
+                startElementJustSeen = false;
                 CharSequence text = parser.getText();
-                if (event == XmlPullParser.TEXT) {
-                    text = StringUtils.escapeForXmlText(text);
+                if (event == XmlPullParser.Event.TEXT_CHARACTERS) {
+                    text = StringUtils.escapeForXml(text);
                 }
                 sb.append(text);
-            }
-            if (event == XmlPullParser.END_TAG && parser.getDepth() <= depth) {
-                break outerloop;
+                break;
             }
             event = parser.next();
         }
@@ -536,16 +439,14 @@ public class PacketParserUtils {
 
         String language = ParserUtils.getXmlLang(parser);
         if (language != null && !"".equals(language.trim())) {
-        // CHECKSTYLE:OFF
-        	presence.setLanguage(language);
-        // CHECKSTYLE:ON
+            presence.setLanguage(language);
         }
 
         // Parse sub-elements
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (elementName) {
@@ -553,7 +454,7 @@ public class PacketParserUtils {
                     presence.setStatus(parser.nextText());
                     break;
                 case "priority":
-                    int priority = Integer.parseInt(parser.nextText());
+                    Byte priority = ParserUtils.getByteAttributeFromNextText(parser);
                     presence.setPriority(priority);
                     break;
                 case "show":
@@ -587,11 +488,14 @@ public class PacketParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return presence;
@@ -607,9 +511,12 @@ public class PacketParserUtils {
      * @param parser the XML parser, positioned at the start of an IQ packet.
      * @param outerXmlEnvironment the outer XML environment (optional).
      * @return an IQ object.
-     * @throws Exception
+     * @throws XmlPullParserException
+     * @throws XmppStringprepException
+     * @throws IOException
+     * @throws SmackParsingException
      */
-    public static IQ parseIQ(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws Exception {
+    public static IQ parseIQ(XmlPullParser parser, XmlEnvironment outerXmlEnvironment) throws XmlPullParserException, XmppStringprepException, IOException, SmackParsingException {
         ParserUtils.assertAtStartTag(parser);
         final int initialDepth = parser.getDepth();
         XmlEnvironment iqXmlEnvironment = XmlEnvironment.from(parser, outerXmlEnvironment);
@@ -622,10 +529,10 @@ public class PacketParserUtils {
         final IQ.Type type = IQ.Type.fromString(parser.getAttributeValue("", "type"));
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (elementName) {
@@ -640,7 +547,7 @@ public class PacketParserUtils {
                             iqPacket = provider.parse(parser, outerXmlEnvironment);
                     }
                     // Note that if we reach this code, it is guranteed that the result IQ contained a child element
-                    // (RFC 6120 § 8.2.3 6) because otherwhise we would have reached the END_TAG first.
+                    // (RFC 6120 § 8.2.3 6) because otherwhise we would have reached the END_ELEMENT first.
                     else {
                         // No Provider found for the IQ stanza, parse it to an UnparsedIQ instance
                         // so that the content of the IQ can be examined later on
@@ -649,11 +556,14 @@ public class PacketParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         // Decide what to do when an IQ packet was not understood
@@ -694,15 +604,15 @@ public class PacketParserUtils {
         List<String> mechanisms = new ArrayList<String>();
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 String elementName = parser.getName();
                 if (elementName.equals("mechanism")) {
                     mechanisms.add(parser.nextText());
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("mechanisms")) {
                     done = true;
                 }
@@ -721,14 +631,14 @@ public class PacketParserUtils {
      */
     public static Compress.Feature parseCompressionFeature(XmlPullParser parser)
                     throws IOException, XmlPullParserException {
-        assert (parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.START_ELEMENT);
         String name;
         final int initialDepth = parser.getDepth();
         List<String> methods = new LinkedList<>();
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 name = parser.getName();
                 switch (name) {
                 case "method":
@@ -736,7 +646,7 @@ public class PacketParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 name = parser.getName();
                 switch (name) {
                 case Compress.Feature.ELEMENT:
@@ -744,9 +654,13 @@ public class PacketParserUtils {
                         break outerloop;
                     }
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
-        assert (parser.getEventType() == XmlPullParser.END_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.END_ELEMENT);
         assert (parser.getDepth() == initialDepth);
         return new Compress.Feature(methods);
     }
@@ -782,9 +696,9 @@ public class PacketParserUtils {
         String condition = null;
         Map<String, String> descriptiveTexts = null;
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 if (name.equals("text")) {
                     descriptiveTexts = parseDescriptiveTexts(parser, descriptiveTexts);
@@ -794,11 +708,14 @@ public class PacketParserUtils {
                     condition = parser.getName();
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new SASLFailure(condition, descriptiveTexts);
@@ -826,9 +743,9 @@ public class PacketParserUtils {
         String conditionText = null;
         XmlEnvironment streamErrorXmlEnvironment = XmlEnvironment.from(parser, outerXmlEnvironment);
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (namespace) {
@@ -841,8 +758,9 @@ public class PacketParserUtils {
                         // If it's not a text element, that is qualified by the StreamError.NAMESPACE,
                         // then it has to be the stream error code
                         condition = StreamError.Condition.fromString(name);
-                        if (!parser.isEmptyElementTag()) {
-                            conditionText = parser.nextText();
+                        conditionText = parser.nextText();
+                        if (conditionText.isEmpty()) {
+                            conditionText = null;
                         }
                         break;
                     }
@@ -852,11 +770,14 @@ public class PacketParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new StreamError(condition, conditionText, descriptiveTexts, extensions);
@@ -888,9 +809,9 @@ public class PacketParserUtils {
         builder.setErrorGenerator(parser.getAttributeValue("", "by"));
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (namespace) {
@@ -901,8 +822,9 @@ public class PacketParserUtils {
                         break;
                     default:
                         builder.setCondition(StanzaError.Condition.fromString(name));
-                        if (!parser.isEmptyElementTag()) {
-                            builder.setConditionText(parser.nextText());
+                        String conditionText = parser.nextText();
+                        if (!conditionText.isEmpty()) {
+                            builder.setConditionText(conditionText);
                         }
                         break;
                     }
@@ -911,10 +833,14 @@ public class PacketParserUtils {
                     PacketParserUtils.addExtensionElement(extensions, parser, name, namespace, stanzaErrorXmlEnvironment);
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         builder.setExtensions(extensions).setDescriptiveTexts(descriptiveTexts);
@@ -949,14 +875,14 @@ public class PacketParserUtils {
 
     public static StartTls parseStartTlsFeature(XmlPullParser parser)
                     throws XmlPullParserException, IOException {
-        assert (parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.START_ELEMENT);
         assert (parser.getNamespace().equals(StartTls.NAMESPACE));
         int initalDepth = parser.getDepth();
         boolean required = false;
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "required":
@@ -964,13 +890,17 @@ public class PacketParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initalDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
-        assert (parser.getEventType() == XmlPullParser.END_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.END_ELEMENT);
         return new StartTls(required);
     }
 
@@ -978,14 +908,11 @@ public class PacketParserUtils {
         ParserUtils.assertAtStartTag(parser);
         final int initialDepth = parser.getDepth();
         boolean optional = false;
-        if (parser.isEmptyElementTag()) {
-            return new Session.Feature(optional);
-        }
 
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                     case Session.Feature.OPTIONAL_ELEMENT:
@@ -993,10 +920,14 @@ public class PacketParserUtils {
                         break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
index 2a06c9c3c..86d091841 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
@@ -23,12 +23,15 @@ import java.text.ParseException;
 import java.util.Date;
 import java.util.Locale;
 
-import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 
+import org.jivesoftware.smack.datatypes.UInt16;
+import org.jivesoftware.smack.datatypes.UInt32;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackUriSyntaxParsingException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityFullJid;
@@ -38,8 +41,6 @@ import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
 import org.jxmpp.stringprep.XmppStringprepException;
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class ParserUtils {
 
@@ -49,7 +50,7 @@ public class ParserUtils {
     public static final String JID = "jid";
 
     public static void assertAtStartTag(XmlPullParser parser) throws XmlPullParserException {
-        assert (parser.getEventType() == XmlPullParser.START_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.START_ELEMENT);
     }
 
     public static void assertAtStartTag(XmlPullParser parser, String name) throws XmlPullParserException {
@@ -58,13 +59,13 @@ public class ParserUtils {
     }
 
     public static void assertAtEndTag(XmlPullParser parser) throws XmlPullParserException {
-        assert (parser.getEventType() == XmlPullParser.END_TAG);
+        assert (parser.getEventType() == XmlPullParser.Event.END_ELEMENT);
     }
 
     public static void forwardToEndTagOfDepth(XmlPullParser parser, int depth)
                     throws XmlPullParserException, IOException {
-        int event = parser.getEventType();
-        while (!(event == XmlPullParser.END_TAG && parser.getDepth() == depth)) {
+        XmlPullParser.Event event = parser.getEventType();
+        while (!(event == XmlPullParser.Event.END_ELEMENT && parser.getDepth() == depth)) {
             event = parser.next();
         }
     }
@@ -178,6 +179,11 @@ public class ParserUtils {
         }
     }
 
+    public static Byte getByteAttributeFromNextText(XmlPullParser parser) throws IOException, XmlPullParserException {
+        String nextText = parser.nextText();
+        return Byte.valueOf(nextText);
+    }
+
     public static int getIntegerAttributeOrThrow(XmlPullParser parser, String name, String throwMessage)
                     throws IOException {
         Integer res = getIntegerAttribute(parser, name);
@@ -205,6 +211,14 @@ public class ParserUtils {
         }
     }
 
+    public static UInt16 getUInt16Attribute(XmlPullParser parser, String name) {
+        Integer integer = getIntegerAttribute(parser, name);
+        if (integer == null) {
+            return null;
+        }
+        return UInt16.from(integer);
+    }
+
     public static int getIntegerFromNextText(XmlPullParser parser) throws XmlPullParserException, IOException {
         String intString = parser.nextText();
         return Integer.valueOf(intString);
@@ -227,6 +241,14 @@ public class ParserUtils {
         }
     }
 
+    public static UInt32 getUInt32Attribute(XmlPullParser parser, String name) {
+        Long l = getLongAttribute(parser, name);
+        if (l == null) {
+            return null;
+        }
+        return UInt32.from(l);
+    }
+
     public static double getDoubleFromNextText(XmlPullParser parser) throws XmlPullParserException, IOException {
         String doubleString = parser.nextText();
         return Double.valueOf(doubleString);
@@ -323,13 +345,16 @@ public class ParserUtils {
         return parser.getAttributeValue("http://www.w3.org/XML/1998/namespace", "lang");
     }
 
+    /**
+     * Get the QName of the current element.
+     *
+     * @param parser the parser.
+     * @return the Qname.
+     * @deprecated use {@link XmlPullParser#getQName()} instead.
+     */
+    @Deprecated
+    // TODO: Remove in Smack 4.5
     public static QName getQName(XmlPullParser parser) {
-        String elementName = parser.getName();
-        String prefix = parser.getPrefix();
-        if (prefix == null) {
-            prefix = XMLConstants.DEFAULT_NS_PREFIX;
-        }
-        String namespace = parser.getNamespace();
-        return new QName(namespace, elementName, prefix);
+        return parser.getQName();
     }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
index a3d7ad096..0798c1ab0 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
@@ -17,7 +17,9 @@
 
 package org.jivesoftware.smack.util;
 
-import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.nio.CharBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Random;
@@ -29,7 +31,23 @@ public class StringUtils {
 
     public static final String MD5 = "MD5";
     public static final String SHA1 = "SHA-1";
+
+    /**
+     * Deprecated, do not use.
+     *
+     * @deprecated use StandardCharsets.UTF_8 instead.
+     */
+    // TODO: Remove in Smack 4.5.
+    @Deprecated
     public static final String UTF8 = "UTF-8";
+
+    /**
+     * Deprecated, do not use.
+     *
+     * @deprecated use StandardCharsets.US_ASCII instead.
+     */
+    // TODO: Remove in Smack 4.5.
+    @Deprecated
     public static final String USASCII = "US-ASCII";
 
     public static final String QUOTE_ENCODE = "&quot;";
@@ -244,22 +262,13 @@ public class StringUtils {
     }
 
     public static byte[] toUtf8Bytes(String string) {
-        try {
-            return string.getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException("UTF-8 encoding not supported by platform", e);
-        }
+        return string.getBytes(StandardCharsets.UTF_8);
     }
 
     /**
-     * Array of numbers and letters of mixed case. Numbers appear in the list
-     * twice so that there is a more equal chance that a number will be picked.
-     * We can use the array to get a random number or letter by picking a random
-     * array index.
+     * 24 upper case characters from the latin alphabet and numbers without '0' and 'O'.
      */
-    private static final char[] numbersAndLetters = ("0123456789abcdefghijklmnopqrstuvwxyz" +
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray();
+    private static final char[] UNAMBIGUOUS_NUMBERS_AND_LETTER = "123456789ABCDEFGHIJKLMNPQRSTUVWXYZ".toCharArray();
 
     /**
      * Returns a random String of numbers and letters (lower and upper case)
@@ -278,6 +287,74 @@ public class StringUtils {
         return randomString(length, RandomUtil.RANDOM.get());
     }
 
+    public static String secureOnlineAttackSafeRandomString() {
+        // 34^10 = 2.06e15 possible combinations. Which is enough to protect against online brute force attacks.
+        // See also https://www.grc.com/haystack.htm
+        final int REQUIRED_LENGTH = 10;
+
+        return randomString(RandomUtil.SECURE_RANDOM.get(), UNAMBIGUOUS_NUMBERS_AND_LETTER, REQUIRED_LENGTH);
+    }
+
+    public static String secureUniqueRandomString() {
+        // 34^13 = 8.11e19 possible combinations, which is > 2^64.
+        final int REQUIRED_LENGTH = 13;
+
+        return randomString(RandomUtil.SECURE_RANDOM.get(), UNAMBIGUOUS_NUMBERS_AND_LETTER, REQUIRED_LENGTH);
+    }
+
+    /**
+     * Generate a secure random string with is human readable. The resulting string consists of 24 upper case characters
+     * from the Latin alphabet and numbers without '0' and 'O', grouped into 4-characters chunks, e.g.
+     * "TWNK-KD5Y-MT3T-E1GS-DRDB-KVTW". The characters are randomly selected by a cryptographically secure pseudorandom
+     * number generator (CSPRNG).
+     * <p>
+     * The string can be used a backup "code" for secrets, and is in fact the same as the one backup code specified in
+     * XEP-0373 and the one used by the <a href="https://github.com/open-keychain/open-keychain/wiki/Backups">Backup
+     * Format v2 of OpenKeychain</a>.
+     * </p>
+     *
+     * @see <a href="https://xmpp.org/extensions/xep-0373.html#backup-encryption"> XEP-0373 §5.4 Encrypting the Secret
+     *      Key Backup</a>
+     * @return a human readable secure random string.
+     */
+    public static String secureOfflineAttackSafeRandomString() {
+        // 34^24 = 2^122.10 possible combinations. Which is enough to protect against offline brute force attacks.
+        // See also https://www.grc.com/haystack.htm
+        final int REQUIRED_LENGTH = 24;
+
+        return randomString(RandomUtil.SECURE_RANDOM.get(), UNAMBIGUOUS_NUMBERS_AND_LETTER, REQUIRED_LENGTH);
+    }
+
+    private static final int RANDOM_STRING_CHUNK_SIZE = 4;
+
+    private static String randomString(Random random, char[] alphabet, int numRandomChars) {
+        // The buffer most hold the size of the requested number of random chars and the chunk separators ('-').
+        int bufferSize = numRandomChars + ((numRandomChars - 1) / RANDOM_STRING_CHUNK_SIZE);
+        CharBuffer charBuffer = CharBuffer.allocate(bufferSize);
+
+        try {
+            randomString(charBuffer, random, alphabet, numRandomChars);
+        } catch (IOException e) {
+            // This should never happen if we calcuate the buffer size correctly.
+            throw new AssertionError(e);
+        }
+
+        return charBuffer.flip().toString();
+    }
+
+    private static void randomString(Appendable appendable, Random random, char[] alphabet, int numRandomChars)
+                    throws IOException {
+        for (int randomCharNum = 1; randomCharNum <= numRandomChars; randomCharNum++) {
+            int randomIndex = random.nextInt(alphabet.length);
+            char randomChar = alphabet[randomIndex];
+            appendable.append(randomChar);
+
+            if (randomCharNum % RANDOM_STRING_CHUNK_SIZE == 0 && randomCharNum < numRandomChars) {
+                appendable.append('-');
+            }
+        }
+    }
+
     public static String randomString(final int length) {
         return randomString(length, RandomUtil.SECURE_RANDOM.get());
     }
@@ -287,24 +364,14 @@ public class StringUtils {
             return "";
         }
 
-        byte[] randomBytes = new byte[length];
-        random.nextBytes(randomBytes);
         char[] randomChars = new char[length];
         for (int i = 0; i < length; i++) {
-            randomChars[i] = getPrintableChar(randomBytes[i]);
+            int index = random.nextInt(UNAMBIGUOUS_NUMBERS_AND_LETTER.length);
+            randomChars[i] = UNAMBIGUOUS_NUMBERS_AND_LETTER[index];
         }
         return new String(randomChars);
     }
 
-    private static char getPrintableChar(byte indexByte) {
-        assert (numbersAndLetters.length < Byte.MAX_VALUE * 2);
-
-        // Convert indexByte as it where an unsigned byte by promoting it to int
-        // and masking it with 0xff. Yields results from 0 - 254.
-        int index = indexByte & 0xff;
-        return numbersAndLetters[index % numbersAndLetters.length];
-    }
-
     /**
      * Returns true if CharSequence is not null and is not empty, false otherwise.
      * Examples:
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
index 3fb5057ef..0785c3860 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/TLSUtils.java
@@ -64,7 +64,7 @@ public class TLSUtils {
      *
      * @return the given builder
      */
-    public static <B extends ConnectionConfiguration.Builder<B,?>> B setTLSOnly(B builder) {
+    public static <B extends ConnectionConfiguration.Builder<B, ?>> B setTLSOnly(B builder) {
         builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_2,  PROTO_TLSV1_1, PROTO_TLSV1 });
         return builder;
     }
@@ -84,7 +84,7 @@ public class TLSUtils {
      *
      * @return the given builder
      */
-    public static <B extends ConnectionConfiguration.Builder<B,?>> B setSSLv3AndTLSOnly(B builder) {
+    public static <B extends ConnectionConfiguration.Builder<B, ?>> B setSSLv3AndTLSOnly(B builder) {
         builder.setEnabledSSLProtocols(new String[] { PROTO_TLSV1_2,  PROTO_TLSV1_1, PROTO_TLSV1, PROTO_SSL3 });
         return builder;
     }
@@ -103,7 +103,7 @@ public class TLSUtils {
      * @throws KeyManagementException
      * @return the given builder.
      */
-    public static <B extends ConnectionConfiguration.Builder<B,?>> B acceptAllCertificates(B builder) throws NoSuchAlgorithmException, KeyManagementException {
+    public static <B extends ConnectionConfiguration.Builder<B, ?>> B acceptAllCertificates(B builder) throws NoSuchAlgorithmException, KeyManagementException {
         SSLContext context = SSLContext.getInstance(TLS);
         context.init(null, new TrustManager[] { new AcceptAllTrustManager() }, new SecureRandom());
         builder.setCustomSSLContext(context);
@@ -130,7 +130,7 @@ public class TLSUtils {
      * @param <B> Type of the ConnectionConfiguration builder.
      * @return the given builder.
      */
-    public static <B extends ConnectionConfiguration.Builder<B,?>> B disableHostnameVerificationForTlsCertificates(B builder) {
+    public static <B extends ConnectionConfiguration.Builder<B, ?>> B disableHostnameVerificationForTlsCertificates(B builder) {
         builder.setHostnameVerifier(DOES_NOT_VERIFY_VERIFIER);
         return builder;
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
index 92b1f6a33..e4c7531f7 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
@@ -269,10 +269,20 @@ public class XmlStringBuilder implements Appendable, CharSequence, Element {
 
     public XmlStringBuilder attribute(String name, Enum<?> value) {
         assert value != null;
+        // TODO: Should use toString() instead of name().
         attribute(name, value.name());
         return this;
     }
 
+    public <E extends Enum<?>> XmlStringBuilder attribute(String name, E value, E implicitDefault) {
+        if (value == null || value == implicitDefault) {
+            return this;
+        }
+
+        attribute(name, value.toString());
+        return this;
+    }
+
     public XmlStringBuilder attribute(String name, int value) {
         assert name != null;
         return attribute(name, String.valueOf(value));
@@ -327,6 +337,13 @@ public class XmlStringBuilder implements Appendable, CharSequence, Element {
         return this;
     }
 
+    public XmlStringBuilder optAttribute(String name, Number number) {
+        if (number != null) {
+            attribute(name, number.toString());
+        }
+        return this;
+    }
+
     /**
      * Add the given attribute if {@code value => 0}.
      *
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmppElementUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmppElementUtil.java
index 79729b662..caabf8e89 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmppElementUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmppElementUtil.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus
+ * Copyright 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
  */
 package org.jivesoftware.smack.util;
 
-import org.jivesoftware.smack.packet.FullyQualifiedElement;
+import javax.xml.namespace.QName;
 
-import org.jxmpp.util.XmppStringUtils;
+import org.jivesoftware.smack.packet.FullyQualifiedElement;
 
 public class XmppElementUtil {
 
-    public static String getKeyFor(Class<? extends FullyQualifiedElement> fullyQualifiedElement) {
+    public static QName getQNameFor(Class<? extends FullyQualifiedElement> fullyQualifiedElement) {
         String element, namespace;
         try {
             element = (String) fullyQualifiedElement.getField("ELEMENT").get(null);
@@ -32,14 +32,7 @@ public class XmppElementUtil {
             throw new IllegalArgumentException(e);
         }
 
-        String key = XmppStringUtils.generateKey(element, namespace);
-        return key;
+        return new QName(namespace, element);
     }
 
-    public static String getKeyFor(FullyQualifiedElement fullyQualifiedElement) {
-        String element = fullyQualifiedElement.getElementName();
-        String namespace = fullyQualifiedElement.getNamespace();
-        String key = XmppStringUtils.generateKey(element, namespace);
-        return key;
-    }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java
index 868dd4a63..12856c29a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java
@@ -19,9 +19,7 @@ package org.jivesoftware.smack.util.stringencoder;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import org.jivesoftware.smack.util.StringUtils;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Base32 string encoding is useful for when filenames case-insensitive filesystems are encoded.
@@ -55,13 +53,8 @@ public class Base32 {
 
     public static String decode(String str) {
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
-        byte[] raw;
-        try {
-            raw = str.getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        byte[] raw = str.getBytes(StandardCharsets.UTF_8);
+
         for (int i = 0; i < raw.length; i++) {
             char c = (char) raw[i];
             if (!Character.isWhitespace(c)) {
@@ -114,24 +107,12 @@ public class Base32 {
             }
         }
 
-        String res;
-        try {
-            res = new String(bs.toByteArray(), StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        String res = new String(bs.toByteArray(), StandardCharsets.UTF_8);
         return res;
     }
 
     public static String encode(String str) {
-        byte[] b;
-        try {
-            b = str.getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        byte[] b = str.getBytes(StandardCharsets.UTF_8);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
 
         for (int i = 0; i < (b.length + 4) / 5; i++) {
@@ -174,13 +155,7 @@ public class Base32 {
                 os.write(c);
             }
         }
-        String res;
-        try {
-            res = new String(os.toByteArray(), StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        String res = new String(os.toByteArray(), StandardCharsets.UTF_8);
         return res;
     }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64.java b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64.java
index fb6ae327b..eb71b5f7f 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64.java
@@ -16,10 +16,9 @@
  */
 package org.jivesoftware.smack.util.stringencoder;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import org.jivesoftware.smack.util.Objects;
-import org.jivesoftware.smack.util.StringUtils;
 
 public class Base64 {
 
@@ -31,11 +30,7 @@ public class Base64 {
     }
 
     public static final String encode(String string) {
-        try {
-            return encodeToString(string.getBytes(StringUtils.UTF8));
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException("UTF-8 not supported", e);
-        }
+        return encodeToString(string.getBytes(StandardCharsets.UTF_8));
     }
 
     public static final String encodeToString(byte[] input) {
@@ -56,11 +51,7 @@ public class Base64 {
 
     public static final String decodeToString(String string) {
         byte[] bytes = decode(string);
-        try {
-            return new String(bytes, StringUtils.UTF8);
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException("UTF-8 not supported", e);
-        }
+        return new String(bytes, StandardCharsets.UTF_8);
     }
 
     // TODO: We really should not mask the IllegalArgumentException. But some unit test depend on this behavior, like
@@ -74,12 +65,7 @@ public class Base64 {
     }
 
     public static final byte[] decode(byte[] input) {
-        String string;
-        try {
-            string = new String(input, StringUtils.USASCII);
-        } catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        String string = new String(input, StandardCharsets.US_ASCII);
         return decode(string);
     }
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
index d2c1c3b0b..988cbafef 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
@@ -30,7 +30,7 @@ public class StanzaCollectorTest {
 
     @Test
     public void verifyRollover() throws InterruptedException {
-        TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), 5);
+        StanzaCollector collector = createTestStanzaCollector(null, new OKEverything(), 5);
 
         for (int i = 0; i < 6; i++) {
             Stanza testPacket = new TestPacket(i);
@@ -70,7 +70,7 @@ public class StanzaCollectorTest {
     @Test
     public void verifyThreadSafety() throws InterruptedException {
         final int insertCount = 500;
-        final TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), insertCount);
+        final StanzaCollector collector = createTestStanzaCollector(null, new OKEverything(), insertCount);
 
         final AtomicInteger consumer1Dequeued = new AtomicInteger();
         final AtomicInteger consumer2Dequeued = new AtomicInteger();
@@ -170,10 +170,8 @@ public class StanzaCollectorTest {
 
     }
 
-    static class TestStanzaCollector extends StanzaCollector {
-        protected TestStanzaCollector(XMPPConnection conection, StanzaFilter packetFilter, int size) {
-            super(conection, StanzaCollector.newConfiguration().setStanzaFilter(packetFilter).setSize(size));
-        }
+    private static StanzaCollector createTestStanzaCollector(XMPPConnection connection, StanzaFilter packetFilter, int size) {
+        return new StanzaCollector(connection, StanzaCollector.newConfiguration().setStanzaFilter(packetFilter).setSize(size));
     }
 
     static class TestPacket extends Stanza {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java b/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java
index aadbdb38e..cbc5ba88f 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/compress/packet/FailureTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smack.compress.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.io.IOException;
 
@@ -35,7 +35,7 @@ public class FailureTest {
 
         final String expectedXml = "<failure xmlns='http://jabber.org/protocol/compress'><processing-failed/></failure>";
 
-        assertXMLEqual(expectedXml, xml.toString());
+        assertXmlSimilar(expectedXml, xml.toString());
     }
 
     @Test
@@ -53,6 +53,6 @@ public class FailureTest {
                         + "</error>"
                         + "</failure>";
 
-        assertXMLEqual(expectedXml, xml.toString());
+        assertXmlSimilar(expectedXml, xml.toString());
     }
 }
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/compress/provider/FailureProviderTest.java b/smack-core/src/test/java/org/jivesoftware/smack/compress/provider/FailureProviderTest.java
index 6e2c3a781..ee75ac468 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/compress/provider/FailureProviderTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/compress/provider/FailureProviderTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2018 Florian Schmaus
+ * Copyright 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import org.jivesoftware.smack.compress.packet.Failure;
 import org.jivesoftware.smack.packet.StanzaError;
 import org.jivesoftware.smack.packet.StanzaError.Condition;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class FailureProviderTest {
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
index b2290aeef..82ff71bf8 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smack.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -26,8 +26,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.jivesoftware.smack.test.util.XmlUnitUtils;
-
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
@@ -49,7 +47,7 @@ public class MessageTest {
         Message messageTypeInConstructor = new Message(null, Message.Type.chat);
         messageTypeInConstructor.setStanzaId(null);
         assertEquals(type, messageTypeInConstructor.getType());
-        assertXMLEqual(control, messageTypeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, messageTypeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         controlBuilder = new StringBuilder();
         controlBuilder.append("<message")
@@ -62,7 +60,7 @@ public class MessageTest {
         Message messageTypeSet = getNewMessage();
         messageTypeSet.setType(type2);
         assertEquals(type2, messageTypeSet.getType());
-        assertXMLEqual(control, messageTypeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, messageTypeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test(expected = NullPointerException.class)
@@ -87,7 +85,7 @@ public class MessageTest {
         message.setSubject(messageSubject);
 
         assertEquals(messageSubject, message.getSubject());
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -106,7 +104,7 @@ public class MessageTest {
         message.setBody(messageBody);
 
         assertEquals(messageBody, message.getBody());
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -139,7 +137,7 @@ public class MessageTest {
         message.addBody(null, messageBody1);
         message.addBody(lang2, messageBody2);
         message.addBody(lang3, messageBody3);
-        XmlUnitUtils.assertSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE));
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE));
 
         Collection<String> languages = message.getBodyLanguages();
         List<String> controlLanguages = new ArrayList<>();
@@ -183,7 +181,7 @@ public class MessageTest {
         message.setThread(messageThread);
 
         assertEquals(messageThread, message.getThread());
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -201,7 +199,7 @@ public class MessageTest {
         Message message = getNewMessage();
         message.setLanguage(lang);
 
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     private static Message getNewMessage() {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
index c79463b42..a86e07646 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
@@ -16,14 +16,15 @@
  */
 package org.jivesoftware.smack.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
 
 public class PresenceTest {
@@ -43,7 +44,7 @@ public class PresenceTest {
         Presence presenceTypeInConstructor = new Presence(type);
         presenceTypeInConstructor.setStanzaId(null);
         assertEquals(type, presenceTypeInConstructor.getType());
-        assertXMLEqual(control, presenceTypeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presenceTypeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         controlBuilder = new StringBuilder();
         controlBuilder.append("<presence")
@@ -56,12 +57,14 @@ public class PresenceTest {
         Presence presenceTypeSet = getNewPresence();
         presenceTypeSet.setType(type2);
         assertEquals(type2, presenceTypeSet.getType());
-        assertXMLEqual(control, presenceTypeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presenceTypeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void setNullPresenceTypeTest() {
-        getNewPresence().setType(null);
+        assertThrows(IllegalArgumentException.class, () ->
+        getNewPresence().setType(null)
+        );
     }
 
     @Test
@@ -90,7 +93,7 @@ public class PresenceTest {
         presence.setStatus(status);
 
         assertEquals(status, presence.getStatus());
-        assertXMLEqual(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -109,12 +112,14 @@ public class PresenceTest {
         presence.setPriority(priority);
 
         assertEquals(priority, presence.getPriority());
-        assertXMLEqual(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void setIllegalPriorityTest() {
-        getNewPresence().setPriority(Integer.MIN_VALUE);
+        assertThrows(IllegalArgumentException.class, () ->
+        getNewPresence().setPriority(Integer.MIN_VALUE)
+        );
     }
 
     @Test
@@ -142,7 +147,7 @@ public class PresenceTest {
                 mode1);
         presenceModeInConstructor.setStanzaId(null);
         assertEquals(mode1, presenceModeInConstructor.getMode());
-        assertXMLEqual(control, presenceModeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presenceModeInConstructor.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         controlBuilder = new StringBuilder();
         controlBuilder.append("<presence>")
@@ -155,7 +160,7 @@ public class PresenceTest {
         Presence presenceModeSet = getNewPresence();
         presenceModeSet.setMode(mode2);
         assertEquals(mode2, presenceModeSet.getMode());
-        assertXMLEqual(control, presenceModeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presenceModeSet.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -183,7 +188,7 @@ public class PresenceTest {
         Presence presence = getNewPresence();
         presence.setLanguage(lang);
 
-        assertXMLEqual(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     private static Presence getNewPresence() {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java
index 515053714..76682f07f 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java
@@ -18,19 +18,25 @@ package org.jivesoftware.smack.packet;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+
+import java.io.IOException;
 
 import org.jivesoftware.smack.packet.StreamError.Condition;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 public class StreamErrorTest {
 
-    @Test
-    public void testParsingOfSimpleStreamError() {
-        StreamError error = null;
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testParsingOfSimpleStreamError(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         final String xml =
                 // Usually the stream:stream element has more attributes (to, version, ...)
                 // We omit those, since they are not relevant for testing
@@ -39,19 +45,17 @@ public class StreamErrorTest {
                 "<conflict xmlns='urn:ietf:params:xml:ns:xmpp-streams' /> +" +
                 "</stream:error>" +
                 "</stream:stream>";
-        try {
-            XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
-            error = PacketParserUtils.parseStreamError(parser);
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
+
+        XmlPullParser parser = SmackTestUtil.getParserFor(xml, "error", parserKind);
+        StreamError error = PacketParserUtils.parseStreamError(parser);
+
         assertNotNull(error);
         assertEquals(Condition.conflict, error.getCondition());
     }
 
-    @Test
-    public void testParsingOfStreamErrorWithText() {
-        StreamError error = null;
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testParsingOfStreamErrorWithText(SmackTestUtil.XmlPullParserKind parserKind) throws XmlPullParserException, IOException, SmackParsingException {
         final String xml =
                 // Usually the stream:stream element has more attributes (to, version, ...)
                 // We omit those, since they are not relevant for testing
@@ -63,20 +67,19 @@ public class StreamErrorTest {
                 "</text>" +
                 "</stream:error>" +
                 "</stream:stream>";
-        try {
-            XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
-            error = PacketParserUtils.parseStreamError(parser);
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
+
+        XmlPullParser parser = SmackTestUtil.getParserFor(xml, "error", parserKind);
+        StreamError error = PacketParserUtils.parseStreamError(parser);
+
         assertNotNull(error);
         assertEquals(Condition.conflict, error.getCondition());
         assertEquals("Replaced by new connection", error.getDescriptiveText());
     }
 
-    @Test
-    public void testParsingOfStreamErrorWithTextAndOptionalElement() {
-        StreamError error = null;
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testParsingOfStreamErrorWithTextAndOptionalElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         final String xml =
                 // Usually the stream:stream element has more attributes (to, version, ...)
                 // We omit those, since they are not relevant for testing
@@ -91,12 +94,10 @@ public class StreamErrorTest {
                 "</appSpecificElement>" +
                 "</stream:error>" +
                 "</stream:stream>";
-        try {
-            XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
-            error = PacketParserUtils.parseStreamError(parser);
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
+
+        XmlPullParser parser = SmackTestUtil.getParserFor(xml, "error", parserKind);
+        StreamError error = PacketParserUtils.parseStreamError(parser);
+
         assertNotNull(error);
         assertEquals(Condition.conflict, error.getCondition());
         assertEquals("Replaced by new connection", error.getDescriptiveText());
@@ -104,21 +105,20 @@ public class StreamErrorTest {
         assertNotNull(appSpecificElement);
     }
 
-    @Test
-    public void testStreamErrorXmlNotWellFormed() {
-        StreamError error = null;
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testStreamErrorXmlNotWellFormed(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         final String xml =
                 // Usually the stream:stream element has more attributes (to, version, ...)
                 // We omit those, since they are not relevant for testing
                 "<stream:stream from='im.example.com' id='++TR84Sm6A3hnt3Q065SnAbbk3Y=' xmlns:stream='http://etherx.jabber.org/streams'>" +
                         "<stream:error><xml-not-well-formed xmlns='urn:ietf:params:xml:ns:xmpp-streams'/></stream:error>" +
                         "</stream:stream>";
-        try {
-            XmlPullParser parser = PacketParserUtils.getParserFor(xml, "error");
-            error = PacketParserUtils.parseStreamError(parser);
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
+
+        XmlPullParser parser = SmackTestUtil.getParserFor(xml, "error", parserKind);
+        StreamError error = PacketParserUtils.parseStreamError(parser);
+
         assertNotNull(error);
         assertEquals(Condition.not_well_formed, error.getCondition());
     }
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/TestIQ.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/TestIQ.java
index a9f203632..84aed089d 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/packet/TestIQ.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/TestIQ.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014 Florian Schmaus
+ * Copyright © 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.jivesoftware.smack.packet;
 public class TestIQ extends SimpleIQ {
 
     public TestIQ() {
-        this(null, null);
+        this("https://igniterealtime.org/projects/smack", "test-iq");
     }
 
     public TestIQ(String element, String namespace) {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
index db3283c3e..c8673bc0c 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java
@@ -27,11 +27,11 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class ParsingExceptionTest {
 
@@ -39,6 +39,7 @@ public class ParsingExceptionTest {
     "<extension2 xmlns='namespace'>" +
         "<bar node='testNode'>" +
             "<i id='testid1'>" +
+              "text content" +
             "</i>" +
         "</bar>" +
      "</extension2>";
@@ -57,8 +58,7 @@ public class ParsingExceptionTest {
     public void consumeUnparsedInput() throws Exception {
         final String MESSAGE_EXCEPTION_ELEMENT =
                         "<" + ThrowException.ELEMENT + " xmlns='" + ThrowException.NAMESPACE + "'>" +
-                            "<nothingInHere>" +
-                            "</nothingInHere>" +
+                            "<nothingInHere/>" +
                         "</" + ThrowException.ELEMENT + ">";
         XmlPullParser parser = TestUtils.getMessageParser(
                 "<message from='user@server.example' to='francisco@denmark.lit' id='foo'>" +
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java
index 56da18453..b66024509 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java
@@ -22,10 +22,10 @@ import java.util.Collection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.util.FileUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class ProviderConfigTest {
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java
index b3c5ebe9f..5210e6344 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderManagerTest.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertTrue;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class ProviderManagerTest {
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java b/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
index 0288a55c4..f6f9ba7c6 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/sasl/DigestMd5SaslTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014-2017 Florian Schmaus
+ * Copyright © 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
  */
 package org.jivesoftware.smack.sasl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -39,14 +39,14 @@ public class DigestMd5SaslTest extends AbstractSaslTest {
         super(saslMechanism);
     }
 
-    protected void runTest(boolean useAuthzid) throws SmackException, InterruptedException, XmppStringprepException, UnsupportedEncodingException {
+    protected void runTest(boolean useAuthzid) throws SmackException, InterruptedException, XmppStringprepException {
         EntityBareJid authzid = null;
         if (useAuthzid) {
             authzid = JidCreate.entityBareFrom("shazbat@xmpp.org");
         }
         saslMechanism.authenticate("florian", "irrelevant", JidCreate.domainBareFrom("xmpp.org"), "secret", authzid, null);
         byte[] response = saslMechanism.evaluateChallenge(challengeBytes);
-        String responseString = new String(response, StringUtils.UTF8);
+        String responseString = new String(response, StandardCharsets.UTF_8);
         String[] responseParts = responseString.split(",");
         Map<String, String> responsePairs = new HashMap<String, String>();
         for (String part : responseParts) {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java
index ae60c4543..155954c0e 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestSuite.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smack.test.util;
 
 import java.util.Base64;
 
+import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.util.stringencoder.Base64.Encoder;
 
 /**
@@ -27,6 +28,7 @@ import org.jivesoftware.smack.util.stringencoder.Base64.Encoder;
 public class SmackTestSuite {
 
     static {
+        SmackConfiguration.getVersion();
         org.jivesoftware.smack.util.stringencoder.Base64.setEncoder(new Encoder() {
 
             @Override
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestUtil.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestUtil.java
new file mode 100644
index 000000000..cfa0b114e
--- /dev/null
+++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/SmackTestUtil.java
@@ -0,0 +1,165 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.test.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Predicate;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.packet.Element;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.provider.Provider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParserFactory;
+import org.jivesoftware.smack.xml.stax.StaxXmlPullParserFactory;
+import org.jivesoftware.smack.xml.xpp3.Xpp3XmlPullParserFactory;
+
+public class SmackTestUtil {
+
+    @SuppressWarnings("ImmutableEnumChecker")
+    public enum XmlPullParserKind {
+        StAX(StaxXmlPullParserFactory.class),
+        XPP3(Xpp3XmlPullParserFactory.class),
+        ;
+
+        public final XmlPullParserFactory factory;
+
+        XmlPullParserKind(Class<? extends XmlPullParserFactory> factoryClass) {
+            try {
+                factory = factoryClass.getDeclaredConstructor().newInstance();
+            }
+            catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+                            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+                throw new AssertionError(e);
+            }
+        }
+    }
+
+    public static <E extends Element, P extends Provider<E>> E parse(CharSequence xml, Class<P> providerClass, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        P provider = providerClassToProvider(providerClass);
+        return parse(xml, provider, parserKind);
+    }
+
+    public static <E extends Element, P extends Provider<E>> E parse(InputStream inputStream, Class<P> providerClass, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        P provider = providerClassToProvider(providerClass);
+        return parse(inputStream, provider, parserKind);
+    }
+
+    public static <E extends Element, P extends Provider<E>> E parse(Reader reader, Class<P> providerClass, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        P provider = providerClassToProvider(providerClass);
+        return parse(reader, provider, parserKind);
+    }
+
+    public static <E extends Element> E parse(CharSequence xml, Provider<E> provider, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        String xmlString = xml.toString();
+        Reader reader = new StringReader(xmlString);
+        return parse(reader, provider, parserKind);
+    }
+
+    public static <E extends Element> E parse(InputStream inputStream, Provider<E> provider, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+        return parse(inputStreamReader, provider, parserKind);
+    }
+
+    public static <E extends Element> E parse(Reader reader, Provider<E> provider, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        XmlPullParser parser = getParserFor(reader, parserKind);
+        E element = provider.parse(parser);
+        return element;
+    }
+
+    public static XmlPullParser getParserFor(String xml, XmlPullParserKind parserKind) throws XmlPullParserException, IOException {
+        Reader reader = new StringReader(xml);
+        return getParserFor(reader, parserKind);
+    }
+
+    public static XmlPullParser getParserFor(InputStream inputStream, XmlPullParserKind parserKind) throws XmlPullParserException, IOException {
+        InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+        return getParserFor(inputStreamReader, parserKind);
+    }
+
+    public static XmlPullParser getParserFor(Reader reader, XmlPullParserKind parserKind) throws XmlPullParserException, IOException {
+        XmlPullParser parser = parserKind.factory.newXmlPullParser(reader);
+        forwardParserToStartElement(parser);
+        return parser;
+    }
+
+    public static XmlPullParser getParserFor(String xml, QName startTagQName, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        XmlPullParser parser = getParserFor(xml, parserKind);
+        forwardParserToStartElement(parser, (p) -> p.getQName().equals(startTagQName));
+        return parser;
+    }
+
+    public static XmlPullParser getParserFor(String xml, String startTagLocalpart, XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        XmlPullParser parser = getParserFor(xml, parserKind);
+        forwardParserToStartElement(parser, (p) -> p.getName().equals(startTagLocalpart));
+        return parser;
+    }
+
+    private static <E extends Element, P extends Provider<E>> P providerClassToProvider(Class<P> providerClass) {
+        P provider;
+        // TODO: Consider adding a shortcut in case there is a static INSTANCE field holding an instance of the
+        // requested provider.
+        try {
+            provider = providerClass.getDeclaredConstructor().newInstance();
+        }
+        catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+                        | NoSuchMethodException | SecurityException e) {
+            throw new AssertionError(e);
+        }
+        return provider;
+    }
+
+    private static void forwardParserToStartElement(XmlPullParser parser) throws XmlPullParserException, IOException {
+        forwardParserToStartElement(parser, p -> true);
+    }
+
+    private static void forwardParserToStartElement(XmlPullParser parser,
+                    Predicate<XmlPullParser> doneForwarding) throws XmlPullParserException, IOException {
+        outerloop: while (true) {
+            XmlPullParser.Event event = parser.getEventType();
+            switch (event) {
+            case START_ELEMENT:
+                if (doneForwarding.test(parser)) {
+                    break outerloop;
+                }
+                break;
+            case END_DOCUMENT:
+                throw new IllegalArgumentException("Not matching START_ELEMENT found");
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
+            }
+            parser.next();
+        }
+    }
+}
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
index b6a94d2a9..a1ebdc9ac 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java
@@ -20,14 +20,11 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.jivesoftware.smack.packet.ExtensionElement;
-import org.jivesoftware.smack.packet.XmlEnvironment;
-import org.jivesoftware.smack.util.PacketParserUtils;
-import org.jivesoftware.smack.util.ParserUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.SmackXmlParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
+// TODO: Remove this class and replace it with SmackTestUtil.
 public final class TestUtils {
     private TestUtils() {
     }
@@ -52,12 +49,12 @@ public final class TestUtils {
         return getParser(new StringReader(string), startTag);
     }
 
-    public static XmlPullParser getParser(Reader reader, String startTag) {
+    private static XmlPullParser getParser(Reader reader, String startTag) {
         XmlPullParser parser;
         try {
-            parser = PacketParserUtils.newXmppParser(reader);
+            parser = SmackXmlParser.newXmlParser(reader);
             if (startTag == null) {
-                while (parser.getEventType() != XmlPullParser.START_TAG) {
+                while (parser.getEventType() != XmlPullParser.Event.START_ELEMENT) {
                     parser.next();
                 }
                 return parser;
@@ -65,7 +62,7 @@ public final class TestUtils {
             boolean found = false;
 
             while (!found) {
-                if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag))
+                if ((parser.next() == XmlPullParser.Event.START_ELEMENT) && parser.getName().equals(startTag))
                     found = true;
             }
 
@@ -79,17 +76,4 @@ public final class TestUtils {
         return parser;
     }
 
-    public static <EE extends ExtensionElement> EE parseExtensionElement(String elementString)
-                    throws Exception {
-        return parseExtensionElement(getParser(elementString), null);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <EE extends ExtensionElement> EE parseExtensionElement(XmlPullParser parser, XmlEnvironment outerXmlEnvironment)
-                    throws Exception {
-        ParserUtils.assertAtStartTag(parser);
-        final String elementName = parser.getName();
-        final String namespace = parser.getNamespace();
-        return (EE) PacketParserUtils.parseExtensionElement(elementName, namespace, parser, outerXmlEnvironment);
-    }
 }
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java
index dfde2efc7..18404f70f 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/test/util/XmlUnitUtils.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014-2018 Florian Schmaus
+ * Copyright 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,24 +16,36 @@
  */
 package org.jivesoftware.smack.test.util;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import java.io.StringReader;
 
-import java.io.IOException;
+import javax.xml.transform.stream.StreamSource;
 
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.examples.RecursiveElementNameAndTextQualifier;
-import org.xml.sax.SAXException;
+import org.xmlunit.assertj.CompareAssert;
+import org.xmlunit.assertj.XmlAssert;
+import org.xmlunit.diff.DefaultNodeMatcher;
+import org.xmlunit.diff.ElementSelectors;
+import org.xmlunit.input.NormalizedSource;
 
+// TODO: Rename this class to XmlAssertUtil
 public class XmlUnitUtils {
 
-    // TOOD: Remove this method.
-    public static void assertSimilar(CharSequence expected, CharSequence actual) throws SAXException, IOException {
-        assertXmlSimilar(expected, actual);
+    public static void assertXmlNotSimilar(CharSequence xmlOne, CharSequence xmlTwo) {
+        normalizedCompare(xmlOne, xmlTwo).areNotSimilar();
     }
 
-    public static void assertXmlSimilar(CharSequence expected, CharSequence actual) throws SAXException, IOException {
-        Diff diff = new Diff(expected.toString(), actual.toString());
-        diff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
-        assertXMLEqual(diff, true);
+    public static void assertXmlSimilar(CharSequence expected, CharSequence actual) {
+        normalizedCompare(expected, actual).areSimilar();
+    }
+
+    private static CompareAssert normalizedCompare(CharSequence expectedCharSequence, CharSequence actualCharSequence) {
+        String expectedString = expectedCharSequence.toString();
+        String actualString = actualCharSequence.toString();
+
+        NormalizedSource expected = new NormalizedSource(new StreamSource(new StringReader(expectedString)));
+        NormalizedSource actual = new NormalizedSource(new StreamSource(new StringReader(actualString)));
+        return XmlAssert.assertThat(expected).and(actual)
+                        .ignoreChildNodesOrder()
+                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndAllAttributes, ElementSelectors.byNameAndText))
+                        .normalizeWhitespace();
     }
 }
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java b/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java
index e014caca5..1b453979f 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/MemoryLeakTestUtil.java
@@ -16,8 +16,8 @@
  */
 package org.jivesoftware.smack.util;
 
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
@@ -51,6 +51,7 @@ public class MemoryLeakTestUtil {
 
     private static final Logger LOGGER = Logger.getLogger(MemoryLeakTestUtil.class.getName());
 
+    @SuppressWarnings("UnusedVariable")
     public static <M extends Manager> void noResourceLeakTest(Function<DummyConnection, M> managerSupplier)
             throws XmppStringprepException, IllegalArgumentException, InterruptedException {
         final int numConnections = 10;
@@ -103,10 +104,27 @@ public class MemoryLeakTestUtil {
     }
 
     private static void assertReferencesQueueSize(ReferenceQueue<?> referenceQueue, int expectedSize) throws IllegalArgumentException, InterruptedException {
-        final int timeout = 60000;
+        final int timeout = 120000;
+        final int maxAttempts = 3;
         for (int itemsRemoved = 0; itemsRemoved < expectedSize; ++itemsRemoved) {
-            Reference<?> reference = referenceQueue.remove(timeout);
-            assertNotNull("No reference found after " + timeout + "ms", reference);
+            int attempt = 0;
+            Reference<?> reference = null;
+            do {
+                reference = referenceQueue.remove(timeout);
+                if (reference != null) {
+                    break;
+                }
+
+                attempt++;
+                String message = "No reference to a gc'ed object found after " + timeout + "ms in the " + attempt
+                                + ". attempt.";
+                if (attempt >= maxAttempts) {
+                    fail(message);
+                }
+
+                LOGGER.warning(message);
+                triggerGarbageCollection();
+            } while (true);
             reference.clear();
         }
 
@@ -119,6 +137,7 @@ public class MemoryLeakTestUtil {
         assertNull(reference);
     }
 
+    @SuppressWarnings("UnusedVariable")
     private static void triggerGarbageCollection() {
         Object object = new Object();
         WeakReference<Object> weakReference = new WeakReference<>(object);
@@ -130,6 +149,8 @@ public class MemoryLeakTestUtil {
                 throw new AssertionError("No observed gargabe collection after " + gcCalls + " calls of System.gc()");
             }
             System.gc();
+            // TODO: Would a Thread.yield() here improve the chances of a full GC? It appears that on some systems we
+            // observe a partial GC here.
             gcCalls++;
         } while (weakReference.get() != null);
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/NetworkUtil.java b/smack-core/src/test/java/org/jivesoftware/smack/util/NetworkUtil.java
index d111963f9..ac58e8790 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/NetworkUtil.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/NetworkUtil.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2016 Florian Schmaus
+ * Copyright 2016-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ public class NetworkUtil {
 
     private static final Logger LOGGER = Logger.getLogger(NetworkUtil.class.getName());
 
-    public static ServerSocket getSocketOnLoopback() {
+    public static ServerSocket getSocketOnLoopback() throws IOException {
         final InetAddress loopbackAddress = InetAddress.getLoopbackAddress();
         final int portMin = 1024;
         final int portMax = (1 << 16) - 1;
@@ -40,13 +40,12 @@ public class NetworkUtil {
                 break;
             } catch (BindException e) {
                 LOGGER.log(Level.FINEST, "Could not bind port " + port + ", trying next", e);
-            } catch (IOException e) {
-                throw new IllegalStateException(e);
             }
         }
 
         if (serverSocket == null) {
-            throw new IllegalStateException();
+            throw new IOException("Could not bind any port between " + portMin + " and " + portMax
+                            + " on loopback address" + loopbackAddress);
         }
 
         return serverSocket;
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 c2ed877f5..a186582f0 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
@@ -16,8 +16,8 @@
  */
 package org.jivesoftware.smack.util;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLNotEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlNotSimilar;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -29,6 +29,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.parsers.ParserConfigurationException;
@@ -42,15 +44,17 @@ import org.jivesoftware.smack.packet.StreamOpen;
 import org.jivesoftware.smack.sasl.SASLError;
 import org.jivesoftware.smack.sasl.packet.SaslStreamElements;
 import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
 import org.jivesoftware.smack.test.util.TestUtils;
-import org.jivesoftware.smack.test.util.XmlUnitUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.xml.sax.SAXException;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class PacketParserUtilsTest {
 
@@ -59,8 +63,9 @@ public class PacketParserUtilsTest {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
 
-    @Test
-    public void singleMessageBodyTest() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void singleMessageBodyTest(SmackTestUtil.XmlPullParserKind parserKind) throws Exception {
         String defaultLanguage = Stanza.getDefaultLanguage();
         String otherLanguage = determineNonDefaultLanguage();
 
@@ -79,13 +84,13 @@ public class PacketParserUtilsTest {
             .asString(outputProperties);
 
         Message message = PacketParserUtils
-                        .parseMessage(PacketParserUtils.getParserFor(control));
+                        .parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertEquals(defaultLanguage, message.getBody());
         assertTrue(message.getBodyLanguages().isEmpty());
         assertEquals(defaultLanguage, message.getBody(defaultLanguage));
         assertNull(message.getBody(otherLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has non-default language, body has no language
         control = XMLBuilder.create("message")
@@ -99,13 +104,13 @@ public class PacketParserUtilsTest {
                 .t(otherLanguage)
             .asString(outputProperties);
 
-        message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control));
+        message = PacketParserUtils.parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertEquals(otherLanguage, message.getBody());
         assertTrue(message.getBodyLanguages().isEmpty());
         assertEquals(otherLanguage, message.getBody(otherLanguage));
         assertNull(message.getBody(defaultLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has no language, body has no language
         control = XMLBuilder.create("message")
@@ -118,13 +123,13 @@ public class PacketParserUtilsTest {
                 .t(defaultLanguage)
             .asString(outputProperties);
 
-        message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control));
+        message = PacketParserUtils.parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertEquals(defaultLanguage, message.getBody());
         assertTrue(message.getBodyLanguages().isEmpty());
         assertEquals(defaultLanguage, message.getBody(null));
         assertNull(message.getBody(otherLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has no language, body has default language
         control = XMLBuilder.create("message")
@@ -138,14 +143,14 @@ public class PacketParserUtilsTest {
                 .t(defaultLanguage)
             .asString(outputProperties);
 
-        message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control));
+        message = PacketParserUtils.parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertNull(message.getBody());
         assertFalse(message.getBodyLanguages().isEmpty());
         assertEquals(defaultLanguage, message.getBody(defaultLanguage));
         assertNull(message.getBody(otherLanguage));
 
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has no language, body has non-default language
         control = XMLBuilder.create("message")
@@ -159,14 +164,14 @@ public class PacketParserUtilsTest {
                 .t(otherLanguage)
             .asString(outputProperties);
 
-        message =  PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control));
+        message =  PacketParserUtils.parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertNull(message.getBody());
         assertFalse(message.getBodyLanguages().isEmpty());
         assertTrue(message.getBodyLanguages().contains(otherLanguage));
         assertEquals(otherLanguage, message.getBody(otherLanguage));
         assertNull(message.getBody(defaultLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has default language, body has non-default language
         control = XMLBuilder.create("message")
@@ -181,14 +186,14 @@ public class PacketParserUtilsTest {
                 .t(otherLanguage)
             .asString(outputProperties);
 
-        message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control));
+        message = PacketParserUtils.parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertNull(message.getBody());
         assertFalse(message.getBodyLanguages().isEmpty());
         assertTrue(message.getBodyLanguages().contains(otherLanguage));
         assertEquals(otherLanguage, message.getBody(otherLanguage));
         assertNull(message.getBody(defaultLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has non-default language, body has default language
         control = XMLBuilder.create("message")
@@ -203,14 +208,14 @@ public class PacketParserUtilsTest {
                 .t(defaultLanguage)
             .asString(outputProperties);
 
-        message = PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(control));
+        message = PacketParserUtils.parseMessage(SmackTestUtil.getParserFor(control, parserKind));
 
         assertNull(message.getBody());
         assertFalse(message.getBodyLanguages().isEmpty());
         assertTrue(message.getBodyLanguages().contains(defaultLanguage));
         assertEquals(defaultLanguage, message.getBody(defaultLanguage));
         assertNull(message.getBody(otherLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
     }
 
@@ -239,7 +244,7 @@ public class PacketParserUtilsTest {
         assertTrue(message.getSubjectLanguages().isEmpty());
         assertEquals(defaultLanguage, message.getSubject(defaultLanguage));
         assertNull(message.getSubject(otherLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has non-default language, subject has no language
         control = XMLBuilder.create("message")
@@ -258,7 +263,7 @@ public class PacketParserUtilsTest {
         assertTrue(message.getSubjectLanguages().isEmpty());
         assertEquals(otherLanguage, message.getSubject(otherLanguage));
         assertNull(message.getSubject(defaultLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has no language, subject has no language
         control = XMLBuilder.create("message")
@@ -276,7 +281,7 @@ public class PacketParserUtilsTest {
         assertTrue(message.getSubjectLanguages().isEmpty());
         assertEquals(defaultLanguage, message.getSubject(null));
         assertNull(message.getSubject(otherLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has no language, subject has default language
         control = XMLBuilder.create("message")
@@ -295,7 +300,7 @@ public class PacketParserUtilsTest {
         assertEquals(defaultLanguage, message.getSubject(defaultLanguage));
         assertNull(message.getSubject(otherLanguage));
 
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has no language, subject has non-default language
         control = XMLBuilder.create("message")
@@ -315,7 +320,7 @@ public class PacketParserUtilsTest {
         assertTrue(message.getSubjectLanguages().contains(otherLanguage));
         assertEquals(otherLanguage, message.getSubject(otherLanguage));
         assertNull(message.getSubject(defaultLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has default language, subject has non-default language
         control = XMLBuilder.create("message")
@@ -336,7 +341,7 @@ public class PacketParserUtilsTest {
         assertTrue(message.getSubjectLanguages().contains(otherLanguage));
         assertEquals(otherLanguage, message.getSubject(otherLanguage));
         assertNull(message.getSubject(defaultLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has non-default language, subject has default language
         control = XMLBuilder.create("message")
@@ -357,7 +362,7 @@ public class PacketParserUtilsTest {
         assertTrue(message.getSubjectLanguages().contains(defaultLanguage));
         assertEquals(defaultLanguage, message.getSubject(defaultLanguage));
         assertNull(message.getSubject(otherLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
     }
 
@@ -393,7 +398,7 @@ public class PacketParserUtilsTest {
         assertEquals(2, message.getBodies().size());
         assertEquals(1, message.getBodyLanguages().size());
         assertTrue(message.getBodyLanguages().contains(otherLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
 
         // message has non-default language, first body no language, second body default language
         control = XMLBuilder.create("message")
@@ -419,7 +424,7 @@ public class PacketParserUtilsTest {
         assertEquals(2, message.getBodies().size());
         assertEquals(1, message.getBodyLanguages().size());
         assertTrue(message.getBodyLanguages().contains(defaultLanguage));
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
     }
 
     // TODO: Re-enable once we throw an exception on duplicate body elements.
@@ -452,7 +457,7 @@ public class PacketParserUtilsTest {
         assertEquals(defaultLanguage, message.getBody(defaultLanguage));
         assertEquals(1, message.getBodies().size());
         assertEquals(0, message.getBodyLanguages().size());
-        assertXMLNotEqual(control, message.toXML().toString());
+        assertXmlNotSimilar(control, message.toXML().toString());
     }
 
     @Ignore
@@ -510,7 +515,7 @@ public class PacketParserUtilsTest {
         assertEquals(otherLanguage, message.getBody(otherLanguage));
         assertEquals(2, message.getBodies().size());
         assertEquals(1, message.getBodyLanguages().size());
-        assertXMLEqual(control, message.toXML().toString());
+        assertXmlSimilar(control, message.toXML().toString());
     }
 
     @Test
@@ -544,7 +549,7 @@ public class PacketParserUtilsTest {
         assertEquals(2, message.getSubjects().size());
         assertEquals(1, message.getSubjectLanguages().size());
         assertTrue(message.getSubjectLanguages().contains(otherLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has default language, first subject no language, second subject default language
         control = XMLBuilder.create("message")
@@ -568,7 +573,7 @@ public class PacketParserUtilsTest {
         assertEquals(defaultLanguage, message.getSubject(defaultLanguage));
         assertEquals(1, message.getSubjects().size());
         assertEquals(0, message.getSubjectLanguages().size());
-        assertXMLNotEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlNotSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has non-default language, first subject no language, second subject default language
         control = XMLBuilder.create("message")
@@ -593,7 +598,7 @@ public class PacketParserUtilsTest {
         assertEquals(2, message.getSubjects().size());
         assertEquals(1, message.getSubjectLanguages().size());
         assertTrue(message.getSubjectLanguages().contains(defaultLanguage));
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         /*
         // message has no language, first subject no language, second subject default language
@@ -641,7 +646,7 @@ public class PacketParserUtilsTest {
         assertEquals(otherLanguage, message.getSubject(otherLanguage));
         assertEquals(2, message.getSubjects().size());
         assertEquals(1, message.getSubjectLanguages().size());
-        assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
 
         // message has no language, first subject no language, second subject no language
         control = XMLBuilder.create("message")
@@ -708,13 +713,18 @@ public class PacketParserUtilsTest {
                 .t("Good Message Body")
             .asString(outputProperties);
 
+        // XPP3 writes "end tag", StAX writes "end-tag".
+        Supplier<Stream<String>> expectedContentOfExceptionMessage = () -> Stream.of("end tag", "end-tag");
+
         String invalidControl = validControl.replace("Good Message Body", "Bad </span> Body");
 
         try {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
         } catch (XmlPullParserException e) {
-            assertTrue(e.getMessage().contains("end tag name </span>"));
+            String exceptionMessage = e.getMessage();
+            boolean expectedContentFound = expectedContentOfExceptionMessage.get().anyMatch((expected) -> exceptionMessage.contains(expected));
+            assertTrue(expectedContentFound);
         }
 
         invalidControl = validControl.replace("Good Message Body", "Bad </body> Body");
@@ -723,7 +733,9 @@ public class PacketParserUtilsTest {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
         } catch (XmlPullParserException e) {
-            assertTrue(e.getMessage().contains("end tag name </body>"));
+            String exceptionMessage = e.getMessage();
+            boolean expectedContentFound = expectedContentOfExceptionMessage.get().anyMatch((expected) -> exceptionMessage.contains(expected));
+            assertTrue(expectedContentFound);
         }
 
         invalidControl = validControl.replace("Good Message Body", "Bad </message> Body");
@@ -732,9 +744,10 @@ public class PacketParserUtilsTest {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
         } catch (XmlPullParserException e) {
-            assertTrue(e.getMessage().contains("end tag name </message>"));
+            String exceptionMessage = e.getMessage();
+            boolean expectedContentFound = expectedContentOfExceptionMessage.get().anyMatch((expected) -> exceptionMessage.contains(expected));
+            assertTrue(expectedContentFound);
         }
-
     }
 
     @Test
@@ -763,58 +776,52 @@ public class PacketParserUtilsTest {
             .asString(outputProperties);
 
         Stanza message = PacketParserUtils.parseStanza(control);
-        XmlUnitUtils.assertSimilar(control, message.toXML());
+        assertXmlSimilar(control, message.toXML());
     }
 
     @Test
     public void validateSimplePresence() throws Exception {
-        // CHECKSTYLE:OFF
-    	String stanza = "<presence from='juliet@example.com/balcony' to='romeo@example.net'/>";
+        String stanza = "<presence from='juliet@example.com/balcony' to='romeo@example.net'/>";
 
-    	Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza));
+        Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza));
 
-    	assertXMLEqual(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
-        // CHECKSTYLE:ON
+        assertXmlSimilar(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void validatePresenceProbe() throws Exception {
-        // CHECKSTYLE:OFF
-    	String stanza = "<presence from='mercutio@example.com' id='xv291f38' to='juliet@example.com' type='unsubscribed'/>";
+        String stanza = "<presence from='mercutio@example.com' id='xv291f38' to='juliet@example.com' type='unsubscribed'/>";
 
-    	Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza));
+        Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza));
 
-    	assertXMLEqual(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
-    	assertEquals(Presence.Type.unsubscribed, presence.getType());
-        // CHECKSTYLE:ON
+        assertXmlSimilar(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(Presence.Type.unsubscribed, presence.getType());
     }
 
     @Test
     public void validatePresenceOptionalElements() throws Exception {
-        // CHECKSTYLE:OFF
-    	String stanza = "<presence xml:lang='en' type='unsubscribed'>"
-    			+ "<show>dnd</show>"
-    			+ "<status>Wooing Juliet</status>"
-    			+ "<priority>1</priority>"
-    			+ "</presence>";
+        String stanza = "<presence xml:lang='en' type='unsubscribed'>"
+                + "<show>dnd</show>"
+                + "<status>Wooing Juliet</status>"
+                + "<priority>1</priority>"
+                + "</presence>";
 
-    	Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza));
-    	assertXMLEqual(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
-    	assertEquals(Presence.Type.unsubscribed, presence.getType());
-    	assertEquals("dnd", presence.getMode().name());
-    	assertEquals("en", presence.getLanguage());
-    	assertEquals("Wooing Juliet", presence.getStatus());
-    	assertEquals(1, presence.getPriority());
-        // CHECKSTYLE:ON
+        Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza));
+        assertXmlSimilar(stanza, presence.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(Presence.Type.unsubscribed, presence.getType());
+        assertEquals("dnd", presence.getMode().name());
+        assertEquals("en", presence.getLanguage());
+        assertEquals("Wooing Juliet", presence.getStatus());
+        assertEquals(1, presence.getPriority());
     }
 
-    @Test
-    public void parseContentDepthTest() throws Exception {
-        final String stanza = "<iq type='result' to='foo@bar.com' from='baz.com' id='42'/>";
-        XmlPullParser parser = TestUtils.getParser(stanza, "iq");
-        CharSequence content = PacketParserUtils.parseContent(parser);
-        assertEquals("", content.toString());
-    }
+//    @Test
+//    public void parseContentDepthTest() throws Exception {
+//        final String stanza = "<iq type='result' to='foo@bar.com' from='baz.com' id='42'/>";
+//        XmlPullParser parser = TestUtils.getParser(stanza, "iq");
+//        CharSequence content = PacketParserUtils.parseContent(parser);
+//        assertEquals("", content.toString());
+//    }
 
     @Test
     public void parseElementMultipleNamespace()
@@ -830,7 +837,7 @@ public class PacketParserUtilsTest {
         // @formatter:on
         XmlPullParser parser = TestUtils.getParser(stanza, "outer");
         CharSequence result = PacketParserUtils.parseElement(parser, true);
-        assertXMLEqual(stanza, result.toString());
+        assertXmlSimilar(stanza, result.toString());
     }
 
     @Test
@@ -843,7 +850,7 @@ public class PacketParserUtilsTest {
         // @formatter:on
         XmlPullParser parser = TestUtils.getParser(saslFailureString, SASLFailure.ELEMENT);
         SASLFailure saslFailure = PacketParserUtils.parseSASLFailure(parser);
-        assertXMLEqual(saslFailureString, saslFailure.toString());
+        assertXmlSimilar(saslFailureString, saslFailure.toString());
     }
 
     @Test
@@ -865,7 +872,7 @@ public class PacketParserUtilsTest {
         // @formatter:on
         XmlPullParser parser = TestUtils.getParser(saslFailureString, SASLFailure.ELEMENT);
         SASLFailure saslFailure = PacketParserUtils.parseSASLFailure(parser);
-        XmlUnitUtils.assertSimilar(saslFailureString, saslFailure.toXML(StreamOpen.CLIENT_NAMESPACE));
+        assertXmlSimilar(saslFailureString, saslFailure.toXML(StreamOpen.CLIENT_NAMESPACE));
     }
 
     @SuppressWarnings("ReferenceEquality")
@@ -909,7 +916,7 @@ public class PacketParserUtilsTest {
                 .element("internal-server-error", StanzaError.ERROR_CONDITION_AND_TEXT_NAMESPACE).up()
                 .element("text", StanzaError.ERROR_CONDITION_AND_TEXT_NAMESPACE).t(text).up()
                 .asString();
-        XmlUnitUtils.assertSimilar(errorXml, error.toXML(StreamOpen.CLIENT_NAMESPACE));
+        assertXmlSimilar(errorXml, error.toXML(StreamOpen.CLIENT_NAMESPACE));
     }
 
     @Test
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
index 7679a118e..226cb07b0 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.Test;
 
@@ -31,11 +31,9 @@ import org.junit.Test;
 public class StringUtilsTest  {
     @Test
     public void testEscapeForXml() {
-        String input = null;
-
         assertNull(StringUtils.escapeForXml(null));
 
-        input = "<b>";
+        String input = "<b>";
         assertCharSequenceEquals("&lt;b&gt;", StringUtils.escapeForXml(input));
 
         input = "\"";
@@ -74,15 +72,15 @@ public class StringUtilsTest  {
     }
 
     @Test
-    public void testEncodeHex() throws UnsupportedEncodingException {
+    public void testEncodeHex() {
         String input = "";
         String output = "";
-        assertEquals(new String(StringUtils.encodeHex(input.getBytes(StringUtils.UTF8))),
+        assertEquals(new String(StringUtils.encodeHex(input.getBytes(StandardCharsets.UTF_8))),
                 output);
 
         input = "foo bar 123";
         output = "666f6f2062617220313233";
-        assertEquals(new String(StringUtils.encodeHex(input.getBytes(StringUtils.UTF8))),
+        assertEquals(new String(StringUtils.encodeHex(input.getBytes(StandardCharsets.UTF_8))),
                 output);
     }
 
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/xml/XmlPullParserTest.java b/smack-core/src/test/java/org/jivesoftware/smack/xml/XmlPullParserTest.java
new file mode 100644
index 000000000..ff82064c9
--- /dev/null
+++ b/smack-core/src/test/java/org/jivesoftware/smack/xml/XmlPullParserTest.java
@@ -0,0 +1,231 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.stream.Stream;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.test.util.SmackTestUtil;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+public class XmlPullParserTest {
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testSimpleEmptyElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        Reader reader = new StringReader("<empty-element/>");
+        XmlPullParser parser = parserKind.factory.newXmlPullParser(reader);
+
+        assertEquals(XmlPullParser.Event.START_DOCUMENT, parser.getEventType());
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
+        QName qname = parser.getQName();
+        assertEquals(qname.getLocalPart(), "empty-element");
+        assertEquals(qname.getPrefix(), XMLConstants.DEFAULT_NS_PREFIX);
+        assertEquals(qname.getNamespaceURI(), XMLConstants.NULL_NS_URI);
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.next());
+        assertEquals(XmlPullParser.Event.END_DOCUMENT, parser.next());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testQNameSimpleElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String simpleElement = "<outer-element xmlns='outer-namespace'><inner-element/></outer-element>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(simpleElement, parserKind);
+        QName qname = parser.getQName();
+        assertEquals("outer-element", qname.getLocalPart());
+        assertEquals("outer-namespace", qname.getNamespaceURI());
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
+        qname = parser.getQName();
+        assertEquals("inner-element", qname.getLocalPart());
+        assertEquals("outer-namespace", qname.getNamespaceURI());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testQNamePrefixElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String prefixElement = "<outer-element xmlns='outer-namespace' xmlns:inner-prefix='inner-namespace'><inner-prefix:inner-element></outer-element>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(prefixElement, parserKind);
+        QName qname = parser.getQName();
+        assertEquals("outer-element", qname.getLocalPart());
+        assertEquals("outer-namespace", qname.getNamespaceURI());
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
+        qname = parser.getQName();
+        assertEquals("inner-element", qname.getLocalPart());
+        assertEquals("inner-namespace", qname.getNamespaceURI());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testAttributesElementWithOneAttribute(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String elementWithOneAttribute = "<element attribute-one='attribute-one-value'/>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(elementWithOneAttribute, parserKind);
+        assertAttributeHolds(parser, 0, "attribute-one", "", "");
+        assertThrows(NullPointerException.class, () ->
+            assertAttributeHolds(parser, 1, "attribute-one", "", ""));
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testAttributesNamespacedElementWithOneAttribute(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String namespacedElementWithOneAttribute = "<element xmlns='element-namespace' attribute-one='attribute-one-value'/>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(namespacedElementWithOneAttribute, parserKind);
+        assertAttributeHolds(parser, 0, "attribute-one", "", "");
+        assertThrows(NullPointerException.class, () ->
+            assertAttributeHolds(parser, 1, "attribute-one", "", ""));
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testAttributesNamespacedElementWithOneNamespacedAttribute(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String namespacedElementWithOneNamespacedAttribute = "<element xmlns='element-namespace' xmlns:attribute-namespace='attribute-namespace-value' attribute-namespace:attribute-one='attribute-one-value'/>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(namespacedElementWithOneNamespacedAttribute, parserKind);
+        assertAttributeHolds(parser, 0, "attribute-one", "attribute-namespace", "attribute-namespace-value");
+        assertThrows(NullPointerException.class, () ->
+            assertAttributeHolds(parser, 1, "attribute-one", "", ""));
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testNamespacedAttributes(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String element = "<element xmlns:attr='attribute-namespace' attr:attributeOneName='attributeOneValue'/>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(element, parserKind);
+        assertEquals(1, parser.getAttributeCount());
+
+        assertEquals("attributeOneName", parser.getAttributeName(0));
+        assertEquals("attr", parser.getAttributePrefix(0));
+        assertEquals("attribute-namespace", parser.getAttributeNamespace(0));
+        QName attributeZeroQname = parser.getAttributeQName(0);
+        assertEquals("attributeOneName", attributeZeroQname.getLocalPart());
+        assertEquals("attr", attributeZeroQname.getPrefix());
+        assertEquals("attribute-namespace", attributeZeroQname.getNamespaceURI());
+
+        // Test how parser handle non-existent attributes.
+        assertNull(parser.getAttributeName(1));
+        assertNull(parser.getAttributePrefix(1));
+        assertNull(parser.getAttributeNamespace(1));
+        QName attributeOneQname = parser.getAttributeQName(1);
+        assertNull(attributeOneQname);
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testAttributeType(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String element = "<element xmlns:attr='attribute-namespace' attr:attributeOneName='attributeOneValue'/>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(element, parserKind);
+
+        assertEquals("CDATA", parser.getAttributeType(0));
+
+        assertNull(parser.getAttributeType(1));
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testNextText(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        XmlPullParser parser;
+
+        String simpleElement = "<element>Element text</element>";
+        parser = SmackTestUtil.getParserFor(simpleElement, parserKind);
+        assertEquals("Element text", parser.nextText());
+
+        String complexElement = "<outer-elment><element1>Element 1 &apos; text</element1><element2>Element 2 text</element2></outer-element>";
+        parser = SmackTestUtil.getParserFor(complexElement, parserKind);
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
+        assertEquals("element1", parser.getName());
+        assertEquals(0, parser.getAttributeCount());
+        assertEquals("Element 1 ' text", parser.nextText());
+
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
+        assertEquals("element2", parser.getName());
+        assertEquals(0, parser.getAttributeCount());
+        assertEquals("Element 2 text", parser.nextText());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testNextTextMixedContent(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String element = "<element>Mixed content element text<inner-element>Inner element text</inner-element></element>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(element, parserKind);
+        assertThrows(XmlPullParserException.class, () -> parser.nextText());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testNextTextOnEndElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String element = "<element>Element text</element>";
+        XmlPullParser parser = SmackTestUtil.getParserFor(element, parserKind);
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.getEventType());
+        assertEquals(XmlPullParser.Event.TEXT_CHARACTERS, parser.next());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.next());
+        assertThrows(XmlPullParserException.class, () -> parser.nextText());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testNextTextOnEmptyElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException {
+        String[] emptyElementStream = Stream.of().toArray(String[]::new);
+        for (String emptyElement : emptyElementStream) {
+            XmlPullParser parser = SmackTestUtil.getParserFor(emptyElement, parserKind);
+            assertEquals(XmlPullParser.Event.START_ELEMENT, parser.getEventType());
+            assertEquals("", parser.nextText());
+        }
+    }
+
+    private static void assertAttributeHolds(XmlPullParser parser, int attributeIndex, String expectedLocalpart,
+                    String expectedPrefix, String expectedNamespace) {
+        QName qname = parser.getAttributeQName(attributeIndex);
+        String qnameNamespaceUri = qname.getNamespaceURI();
+
+        assertEquals(expectedLocalpart, qname.getLocalPart());
+        assertEquals(expectedPrefix, qname.getPrefix());
+        assertEquals(expectedNamespace, qnameNamespaceUri);
+
+        assertEquals(qname.getLocalPart(), parser.getAttributeName(attributeIndex));
+        assertEquals(qname.getPrefix(), parser.getAttributePrefix(attributeIndex));
+
+        final String expectedGetAttributeNamespace;
+        if (qnameNamespaceUri.equals(XMLConstants.NULL_NS_URI)) {
+            expectedGetAttributeNamespace = null;
+        }
+        else {
+            expectedGetAttributeNamespace = qnameNamespaceUri;
+        }
+        assertEquals(expectedGetAttributeNamespace, parser.getAttributeNamespace(attributeIndex));
+    }
+}
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index 941ba25d1..958117672 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -257,11 +257,9 @@ public class EnhancedDebugger extends SmackDebugger {
                 new DefaultTableModel(
                         new Object[] {"Hide", "Timestamp", "", "", "Message", "Id", "Type", "To", "From"},
                         0) {
-                    // CHECKSTYLE:OFF
-        			private static final long serialVersionUID = 8136121224474217264L;
-					@Override
+                    private static final long serialVersionUID = 8136121224474217264L;
+                    @Override
                     public boolean isCellEditable(int rowIndex, int mColIndex) {
-                    // CHECKSTYLE:ON
                         return false;
                     }
 
@@ -689,11 +687,9 @@ public class EnhancedDebugger extends SmackDebugger {
                 new DefaultTableModel(new Object[][] { {"IQ", 0, 0}, {"Message", 0, 0},
                         {"Presence", 0, 0}, {"Other", 0, 0}, {"Total", 0, 0}},
                         new Object[] {"Type", "Received", "Sent"}) {
-                    // CHECKSTYLE:OFF
-        			private static final long serialVersionUID = -6793886085109589269L;
-					@Override
+                    private static final long serialVersionUID = -6793886085109589269L;
+                    @Override
                     public boolean isCellEditable(int rowIndex, int mColIndex) {
-                    // CHECKSTYLE:ON
                         return false;
                     }
                 };
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
index 8d72eb96f..513e28663 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -346,6 +346,7 @@ public final class EnhancedDebuggerWindow {
      *
      * @param evt the event that indicates that the root window is closing
      */
+    @SuppressWarnings("UnusedVariable")
     private synchronized void rootWindowClosing(WindowEvent evt) {
         // Notify to all the debuggers to stop debugging
         for (EnhancedDebugger debugger : debuggers) {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
index 1ccc1949e..e224d6e3d 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
@@ -21,15 +21,14 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension.Direction;
 import org.jivesoftware.smackx.forward.packet.Forwarded;
 import org.jivesoftware.smackx.forward.provider.ForwardedProvider;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * This class implements the {@link ExtensionElementProvider} to parse
  * carbon copied messages from a packet.  It will return a {@link CarbonExtension} stanza extension.
@@ -48,11 +47,11 @@ public class CarbonManagerProvider extends ExtensionElementProvider<CarbonExtens
 
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG && parser.getName().equals("forwarded")) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getName().equals("forwarded")) {
                 fwd = FORWARDED_PROVIDER.parse(parser);
             }
-            else if (eventType == XmlPullParser.END_TAG && dir == Direction.valueOf(parser.getName()))
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && dir == Direction.valueOf(parser.getName()))
                 done = true;
         }
         if (fwd == null) {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java
index e203edcc7..7854204be 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java
@@ -42,6 +42,7 @@ import org.jivesoftware.smack.filter.StanzaExtensionFilter;
 import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 import org.jivesoftware.smackx.chat_markers.filter.ChatMarkersFilter;
 import org.jivesoftware.smackx.chat_markers.filter.EligibleForChatMarkerFilter;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java
index ebff125fa..cf6a21d49 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java
@@ -20,6 +20,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.chat_markers.ChatMarkersState;
 
 /**
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/ChatMarkersFilter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/ChatMarkersFilter.java
index 0571e7109..62381a3bd 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/ChatMarkersFilter.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/ChatMarkersFilter.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.chat_markers.filter;
 
 import org.jivesoftware.smack.filter.StanzaExtensionFilter;
 import org.jivesoftware.smack.filter.StanzaFilter;
+
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 
 /**
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java
index 09492c210..bc97a5007 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.chat_markers.filter;
 import org.jivesoftware.smack.filter.StanzaExtensionFilter;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.chatstates.ChatState;
 import org.jivesoftware.smackx.chatstates.ChatStateManager;
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java
index dece2238d..e5d5e227f 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/AcknowledgedProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.chat_markers.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.AcknowledgedExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Acknowledged extension provider class (XEP-0333).
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java
index 40f966eb2..f65d9e7d8 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/DisplayedProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.chat_markers.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.DisplayedExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Displayed extension provider class (XEP-0333).
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java
index 834b0df2a..f2606887b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/MarkableProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.chat_markers.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.MarkableExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Markable extension provider class (XEP-0333).
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java
index 605ef96c0..03d31d312 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/provider/ReceivedProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.chat_markers.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.ReceivedExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Received extension provider class (XEP-0333).
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/colors/ConsistentColor.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/colors/ConsistentColor.java
index aec73b8d0..1226ce7dc 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/colors/ConsistentColor.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/colors/ConsistentColor.java
@@ -87,11 +87,11 @@ public class ConsistentColor {
     }
 
     /**
-     * Convert an angle in the CbCr plane to values cb,cr in the YCbCr color space.
+     * Convert an angle in the CbCr plane to values cb, cr in the YCbCr color space.
      * @see <a href="https://xmpp.org/extensions/xep-0392.html#algorithm-cbcr">§5.3: CbCr generation</a>
      *
      * @param angle angel in CbCr plane.
-     * @return value pair cb,cr
+     * @return value pair cb, cr
      */
     private static double[] angleToCbCr(double angle) {
         double cb = Math.cos(angle);
@@ -113,11 +113,11 @@ public class ConsistentColor {
     }
 
     /**
-     * Convert a value pair cb,cr in the YCbCr color space to RGB.
+     * Convert a value pair cb, cr in the YCbCr color space to RGB.
      * @see <a href="https://xmpp.org/extensions/xep-0392.html#algorithm-rgb">§5.4: CbCr to RGB</a>
      *
      * @param cbcr value pair from the YCbCr color space
-     * @return RGB value triple (R,G,B in [0,1])
+     * @return RGB value triple (R, G, B in [0,1])
      */
     private static float[] CbCrToRGB(double[] cbcr, double y) {
         double cb = cbcr[0];
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java
index be4d50d27..fb12dca19 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/provider/ClientStateIndicationFeatureProvider.java
@@ -20,12 +20,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.csi.packet.ClientStateIndication;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class ClientStateIndicationFeatureProvider extends ExtensionElementProvider<ClientStateIndication.Feature> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/DnsOverXmppManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/DnsOverXmppManager.java
index 634eab400..618cb1d67 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/DnsOverXmppManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/DnsOverXmppManager.java
@@ -33,6 +33,7 @@ import org.jivesoftware.smack.packet.StanzaError;
 import org.jivesoftware.smack.packet.StanzaError.Condition;
 import org.jivesoftware.smack.packet.StanzaError.Type;
 import org.jivesoftware.smack.util.RandomUtil;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.dox.element.DnsIq;
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/provider/DnsIqProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/provider/DnsIqProvider.java
index 3800060eb..6a02e12b1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/provider/DnsIqProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/dox/provider/DnsIqProvider.java
@@ -21,10 +21,10 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
-import org.jivesoftware.smackx.dox.element.DnsIq;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.dox.element.DnsIq;
 
 public class DnsIqProvider extends IQProvider<DnsIq> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java
index 17132703b..9d4d1185d 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.eme.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class ExplicitMessageEncryptionProvider extends ExtensionElementProvider<ExplicitMessageEncryptionElement> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java
index e75d2ffe9..c20e06d8d 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/provider/HashElementProvider.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2017 Paul Schaub
+ * Copyright © 2017 Paul Schaub, 2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,18 +20,19 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.hashes.HashManager;
 import org.jivesoftware.smackx.hashes.element.HashElement;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Provider for HashElements.
  */
 public class HashElementProvider extends ExtensionElementProvider<HashElement> {
 
+    public static final HashElementProvider INSTANCE = new HashElementProvider();
+
     @Override
     public HashElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
         String algo = parser.getAttributeValue(null, HashElement.ATTR_ALGO);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java
index e4ee704ac..1b3a02adf 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/provider/MessageProcessingHintProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.hints.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.hints.element.MessageProcessingHint;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public abstract class MessageProcessingHintProvider<H extends MessageProcessingHint> extends ExtensionElementProvider<H> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
index a2d5a4c76..60fe19445 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
@@ -22,14 +22,13 @@ import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp;
 import org.jivesoftware.smackx.shim.packet.HeadersExtension;
 import org.jivesoftware.smackx.shim.provider.HeadersProvider;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Abstract parent for Req and Resp stanza providers.
  *
@@ -63,7 +62,7 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
     protected HeadersExtension parseHeaders(XmlPullParser parser) throws IOException, XmlPullParserException, SmackParsingException {
         HeadersExtension headersExtension = null;
         /* We are either at start of headers, start of data or end of req/res */
-        if (parser.next() == XmlPullParser.START_TAG && parser.getName().equals(HeadersExtension.ELEMENT)) {
+        if (parser.next() == XmlPullParser.Event.START_ELEMENT && parser.getName().equals(HeadersExtension.ELEMENT)) {
             headersExtension = HeadersProvider.INSTANCE.parse(parser);
             parser.next();
         }
@@ -85,11 +84,11 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
         boolean done = false;
         AbstractHttpOverXmpp.Data data = null;
         /* We are either at start of data or end of req/res */
-        if (parser.getEventType() == XmlPullParser.START_TAG) {
+        if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT) {
             while (!done) {
-                int eventType = parser.next();
+                XmlPullParser.Event eventType = parser.next();
 
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     switch (parser.getName()) {
                     case ELEMENT_TEXT:
                         child = parseText(parser);
@@ -118,7 +117,7 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
                         // other elements are not allowed
                         throw new IllegalArgumentException("unsupported child tag: " + parser.getName());
                     }
-                } else if (eventType == XmlPullParser.END_TAG) {
+                } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_DATA)) {
                         done = true;
                     }
@@ -134,15 +133,15 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
         boolean done = false;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.END_TAG) {
+            if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(ELEMENT_TEXT)) {
                     done = true;
                 } else {
                     throw new IllegalArgumentException("unexpected end tag of: " + parser.getName());
                 }
-            } else if (eventType == XmlPullParser.TEXT) {
+            } else if (eventType == XmlPullParser.Event.TEXT_CHARACTERS) {
                 text = parser.getText();
             } else {
                 throw new IllegalArgumentException("unexpected eventType: " + eventType);
@@ -159,13 +158,13 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
         boolean startClosed = true;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if ((eventType == XmlPullParser.END_TAG) && parser.getName().equals(ELEMENT_XML)) {
+            if ((eventType == XmlPullParser.Event.END_ELEMENT) && parser.getName().equals(ELEMENT_XML)) {
                 done = true;
             } else { // just write everything else as text
 
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                     if (!startClosed) {
                         builder.append('>');
@@ -175,7 +174,7 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
                     builder.append(parser.getName());
                     appendXmlAttributes(parser, builder);
                     startClosed = false;
-                } else if (eventType == XmlPullParser.END_TAG) {
+                } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
 
                     if (startClosed) {
                         builder.append("</");
@@ -185,7 +184,7 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
                         builder.append("/>");
                         startClosed = true;
                     }
-                } else if (eventType == XmlPullParser.TEXT) {
+                } else if (eventType == XmlPullParser.Event.TEXT_CHARACTERS) {
 
                     if (!startClosed) {
                         builder.append('>');
@@ -223,16 +222,16 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
         boolean done = false;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.END_TAG) {
+            if (eventType == XmlPullParser.Event.END_ELEMENT) {
 
                 if (parser.getName().equals(ELEMENT_BASE_64)) {
                     done = true;
                 } else {
                     throw new IllegalArgumentException("unexpected end tag of: " + parser.getName());
                 }
-            } else if (eventType == XmlPullParser.TEXT) {
+            } else if (eventType == XmlPullParser.Event.TEXT_CHARACTERS) {
                 text = parser.getText();
             } else {
                 throw new IllegalArgumentException("unexpected eventType: " + eventType);
@@ -249,9 +248,9 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
         boolean done = false;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.END_TAG) {
+            if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(ELEMENT_CHUNKED_BASE_64)) {
                     done = true;
                 } else {
@@ -270,9 +269,9 @@ public abstract class AbstractHttpOverXmppProvider<H extends AbstractHttpOverXmp
         boolean done = false;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.END_TAG) {
+            if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(ELEMENT_IBB)) {
                     done = true;
                 } else {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java
index f585fd018..ad21338bb 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java
@@ -20,12 +20,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.hoxt.packet.Base64BinaryChunk;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Stanza provider for base64 binary chunks.
  *
@@ -50,15 +49,15 @@ public class Base64BinaryChunkProvider extends ExtensionElementProvider<Base64Bi
         boolean done = false;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.END_TAG) {
+            if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(Base64BinaryChunk.ELEMENT_CHUNK)) {
                     done = true;
                 } else {
                     throw new IllegalArgumentException("unexpected end tag of: " + parser.getName());
                 }
-            } else if (eventType == XmlPullParser.TEXT) {
+            } else if (eventType == XmlPullParser.Event.TEXT_CHARACTERS) {
                 text = parser.getText();
             } else {
                 throw new IllegalArgumentException("unexpected eventType: " + eventType);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java
index f240b86ef..94e36a88f 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java
@@ -21,13 +21,12 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.hoxt.packet.HttpMethod;
 import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Req stanza provider.
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java
index adfb14b11..9b2a1a593 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java
@@ -20,13 +20,13 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp;
 import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp;
 import org.jivesoftware.smackx.shim.packet.HeadersExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Resp stanza provider.
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java
index 58308ac72..9c33afc96 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProvider.java
@@ -20,13 +20,12 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError;
 import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError_V0_2;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Provider for File Too Large error extension.
  *
@@ -41,10 +40,10 @@ public class FileTooLargeErrorProvider extends ExtensionElementProvider<FileTooL
         Long maxFileSize = null;
 
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
 
             switch (event) {
-                case XmlPullParser.START_TAG:
+                case START_ELEMENT:
                     String name = parser.getName();
                     switch (name) {
                         case "max-file-size":
@@ -52,11 +51,14 @@ public class FileTooLargeErrorProvider extends ExtensionElementProvider<FileTooL
                             break;
                     }
                     break;
-                case XmlPullParser.END_TAG:
+                case END_ELEMENT:
                     if (parser.getDepth() == initialDepth) {
                         break outerloop;
                     }
                     break;
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
index 5a6234865..ed3073600 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProvider.java
@@ -24,15 +24,14 @@ import java.util.Map;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.httpfileupload.HttpFileUploadManager;
 import org.jivesoftware.smackx.httpfileupload.UploadService;
 import org.jivesoftware.smackx.httpfileupload.element.Slot;
 import org.jivesoftware.smackx.httpfileupload.element.Slot_V0_2;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Provider for Slot.
  *
@@ -53,10 +52,10 @@ public class SlotProvider extends IQProvider<Slot> {
         PutElement_V0_4_Content putElementV04Content = null;
 
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
 
             switch (event) {
-                case XmlPullParser.START_TAG:
+                case START_ELEMENT:
                     String name = parser.getName();
                     switch (name) {
                         case "put": {
@@ -89,11 +88,14 @@ public class SlotProvider extends IQProvider<Slot> {
                             break;
                     }
                     break;
-                case XmlPullParser.END_TAG:
+                case END_ELEMENT:
                     if (parser.getDepth() == initialDepth) {
                         break outerloop;
                     }
                     break;
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
 
@@ -115,9 +117,9 @@ public class SlotProvider extends IQProvider<Slot> {
 
         Map<String, String> headers = null;
         outerloop: while (true) {
-            int next = parser.next();
+            XmlPullParser.Event next = parser.next();
             switch (next) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "header":
@@ -132,11 +134,14 @@ public class SlotProvider extends IQProvider<Slot> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java
index 16158cd51..029e1f15e 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetRequestProvider.java
@@ -22,6 +22,8 @@ import java.util.List;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iot.control.element.IoTSetRequest;
 import org.jivesoftware.smackx.iot.control.element.SetBoolData;
@@ -30,19 +32,16 @@ import org.jivesoftware.smackx.iot.control.element.SetDoubleData;
 import org.jivesoftware.smackx.iot.control.element.SetIntData;
 import org.jivesoftware.smackx.iot.control.element.SetLongData;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class IoTSetRequestProvider extends IQProvider<IoTSetRequest> {
 
     @Override
     public IoTSetRequest parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
         List<SetData> data = new ArrayList<>(4);
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name) {
                 case "bool": {
                     String valueName = parser.getAttributeValue(null, "name");
@@ -74,11 +73,14 @@ public class IoTSetRequestProvider extends IQProvider<IoTSetRequest> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new IoTSetRequest(data);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java
index 7343651d1..8ed282fe1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/provider/IoTSetResponseProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.iot.control.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.control.element.IoTSetResponse;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class IoTSetResponseProvider extends IQProvider<IoTSetResponse> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java
index d7e1d8802..a56b8ae8c 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataReadOutAcceptedProvider.java
@@ -21,11 +21,10 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.data.element.IoTDataReadOutAccepted;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class IoTDataReadOutAcceptedProvider extends IQProvider<IoTDataReadOutAccepted> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java
index 863ee169c..8c41c072f 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTDataRequestProvider.java
@@ -21,11 +21,10 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.data.element.IoTDataRequest;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class IoTDataRequestProvider extends IQProvider<IoTDataRequest> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java
index 84c47bf02..fbe9b2d7f 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/provider/IoTFieldsExtensionProvider.java
@@ -28,6 +28,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iot.data.element.IoTDataField;
 import org.jivesoftware.smackx.iot.data.element.IoTFieldsExtension;
@@ -37,8 +39,6 @@ import org.jivesoftware.smackx.iot.element.NodeInfo;
 import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFieldsExtension> {
 
@@ -50,10 +50,10 @@ public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFiel
         boolean done = ParserUtils.getBooleanAttribute(parser, "done", false);
         List<NodeElement> nodes = new ArrayList<>();
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name) {
                 case NodeElement.ELEMENT:
                     NodeElement node = parseNode(parser);
@@ -61,11 +61,14 @@ public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFiel
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new IoTFieldsExtension(seqNr, done, nodes);
@@ -76,10 +79,10 @@ public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFiel
         final NodeInfo nodeInfo = NodeInfoParser.parse(parser);
         List<TimestampElement> timestampElements = new ArrayList<>();
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name){
                 case TimestampElement.ELEMENT:
                     TimestampElement timestampElement = parseTimestampElement(parser);
@@ -87,11 +90,14 @@ public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFiel
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new NodeElement(nodeInfo, timestampElements);
@@ -108,10 +114,10 @@ public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFiel
         }
         List<IoTDataField> fields = new ArrayList<>();
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 IoTDataField field = null;
                 final String fieldName = parser.getAttributeValue(null, "name");
                 final String fieldValue = parser.getAttributeValue(null, "value");
@@ -134,11 +140,14 @@ public class IoTFieldsExtensionProvider extends ExtensionElementProvider<IoTFiel
                     fields.add(field);
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new TimestampElement(date, fields);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java
index 841267f03..3c57fefef 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTClaimedProvider.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.iot.discovery.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTClaimed;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
@@ -26,7 +27,6 @@ import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IoTClaimedProvider extends IQProvider<IoTClaimed> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java
index 1500c1ba1..713eb1df1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownProvider.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.iot.discovery.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTDisown;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
@@ -26,7 +27,6 @@ import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IoTDisownProvider extends IQProvider<IoTDisown> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java
index 2d2739d26..ed33c28ce 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTDisownedProvider.java
@@ -18,13 +18,12 @@ package org.jivesoftware.smackx.iot.discovery.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTDisowned;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
 import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class IoTDisownedProvider extends IQProvider<IoTDisowned> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java
index a30dca07d..1127115f1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRegisterProvider.java
@@ -23,15 +23,14 @@ import java.util.List;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTRegister;
 import org.jivesoftware.smackx.iot.discovery.element.Tag;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
 import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class IoTRegisterProvider extends IQProvider<IoTRegister> {
 
     @Override
@@ -40,8 +39,8 @@ public class IoTRegisterProvider extends IQProvider<IoTRegister> {
         NodeInfo nodeInfo = NodeInfoParser.parse(parser);
         List<Tag> tags = new ArrayList<>();
         while (parser.getDepth() != initialDepth) {
-            int event = parser.next();
-            if (event != XmlPullParser.START_TAG) {
+            XmlPullParser.Event event = parser.next();
+            if (event != XmlPullParser.Event.START_ELEMENT) {
                 continue;
             }
             final String element = parser.getName();
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java
index 2590701e7..f0a201d32 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemoveProvider.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTRemove;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
@@ -28,7 +29,6 @@ import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IoTRemoveProvider extends IQProvider<IoTRemove> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java
index c6a9c7eac..8faa40e7c 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTRemovedProvider.java
@@ -18,13 +18,12 @@ package org.jivesoftware.smackx.iot.discovery.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTRemoved;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
 import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class IoTRemovedProvider extends IQProvider<IoTRemoved> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java
index a3f472f41..490d8034e 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/provider/IoTUnregisterProvider.java
@@ -18,13 +18,12 @@ package org.jivesoftware.smackx.iot.discovery.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.discovery.element.IoTUnregister;
 import org.jivesoftware.smackx.iot.element.NodeInfo;
 import org.jivesoftware.smackx.iot.parser.NodeInfoParser;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class IoTUnregisterProvider extends IQProvider<IoTUnregister> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java
index bec0bc14a..21c729b01 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/parser/NodeInfoParser.java
@@ -18,9 +18,9 @@ package org.jivesoftware.smackx.iot.parser;
 
 import static org.jivesoftware.smack.util.StringUtils.isNullOrEmpty;
 
-import org.jivesoftware.smackx.iot.element.NodeInfo;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smackx.iot.element.NodeInfo;
 
 public class NodeInfoParser {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java
index 070335fb1..ae6013496 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.iot.provisioning.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.provisioning.element.ClearCache;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class ClearCacheProvider extends IQProvider<ClearCache> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java
index 1f6a48bba..ecd8ddd79 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/ClearCacheResponseProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.iot.provisioning.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.provisioning.element.ClearCacheResponse;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class ClearCacheResponseProvider extends IQProvider<ClearCacheResponse> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java
index d00bdea61..95555246a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/FriendProvider.java
@@ -19,12 +19,12 @@ package org.jivesoftware.smackx.iot.provisioning.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.provisioning.element.Friend;
 
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 public class FriendProvider extends ExtensionElementProvider<Friend> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java
index 0ba90db09..8d24f2811 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendProvider.java
@@ -19,12 +19,12 @@ package org.jivesoftware.smackx.iot.provisioning.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.provisioning.element.IoTIsFriend;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IoTIsFriendProvider extends IQProvider<IoTIsFriend> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java
index 0e6fada1d..79a23836d 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/IoTIsFriendResponseProvider.java
@@ -19,13 +19,13 @@ package org.jivesoftware.smackx.iot.provisioning.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.provisioning.element.IoTIsFriendResponse;
 
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IoTIsFriendResponseProvider extends IQProvider<IoTIsFriendResponse> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java
index f80d5ed09..f8351993c 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/provider/UnfriendProvider.java
@@ -19,12 +19,12 @@ package org.jivesoftware.smackx.iot.provisioning.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iot.provisioning.element.Unfriend;
 
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 public class UnfriendProvider extends ExtensionElementProvider<Unfriend> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java
index a6869e7c5..1f94c6927 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.element;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.jingle.element.JingleContent;
 
 /**
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java
index ffd3b51a5..2758f3c18 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.util.Date;
 
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.hashes.element.HashElement;
 import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java
index c0366695e..312aca703 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2017 Paul Schaub
+ * Copyright © 2017 Paul Schaub, 2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingle_filetransfer.element;
 
 import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.hashes.element.HashElement;
 
 /**
@@ -29,14 +30,14 @@ public class Range implements NamedElement {
     public static final String ATTR_OFFSET = "offset";
     public static final String ATTR_LENGTH = "length";
 
-    private final int offset, length;
+    private final Integer offset, length;
     private final HashElement hash;
 
     /**
      * Create a Range element with default values.
      */
     public Range() {
-        this(0, -1, null);
+        this(null, null, null);
     }
 
     /**
@@ -44,7 +45,7 @@ public class Range implements NamedElement {
      * @param length length of the transmitted data in bytes.
      */
     public Range(int length) {
-        this(0, length, null);
+        this(null, length, null);
     }
 
     /**
@@ -62,7 +63,7 @@ public class Range implements NamedElement {
      * @param length number of bytes that shall be transferred.
      * @param hash hash of the bytes in the specified range.
      */
-    public Range(int offset, int length, HashElement hash) {
+    public Range(Integer offset, Integer length, HashElement hash) {
         this.offset = offset;
         this.length = length;
         this.hash = hash;
@@ -102,12 +103,8 @@ public class Range implements NamedElement {
     public CharSequence toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
         XmlStringBuilder sb =  new XmlStringBuilder(this);
 
-        if (offset > 0) {
-            sb.attribute(ATTR_OFFSET, offset);
-        }
-        if (length > 0) {
-            sb.attribute(ATTR_LENGTH, length);
-        }
+        sb.optAttribute(ATTR_OFFSET, offset);
+        sb.optAttribute(ATTR_LENGTH, length);
 
         if (hash != null) {
             sb.rightAngleBracket();
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java
index 023a04fab..c781cfbb5 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java
@@ -16,14 +16,14 @@
  */
 package org.jivesoftware.smackx.jingle_filetransfer.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.hashes.element.HashElement;
 import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
@@ -31,9 +31,6 @@ import org.jivesoftware.smackx.jingle_filetransfer.element.Checksum;
 import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChild;
 import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Provider for the Checksum element.
  */
@@ -54,10 +51,11 @@ public class ChecksumProvider extends ExtensionElementProvider<Checksum> {
 
         boolean go = true;
         while (go) {
-            int tag = parser.nextTag();
+            XmlPullParser.TagEvent tag = parser.nextTag();
             String n = parser.getText();
 
-            if (tag == START_TAG) {
+            switch (tag) {
+            case START_ELEMENT:
                 switch (n) {
                     case HashElement.ELEMENT:
                         hashElement = new HashElementProvider().parse(parser);
@@ -70,7 +68,8 @@ public class ChecksumProvider extends ExtensionElementProvider<Checksum> {
                         int l = length == null ? -1 : Integer.parseInt(length);
                         range = new Range(o, l);
                 }
-            } else if (tag == END_TAG) {
+                break;
+            case END_ELEMENT:
                 switch (n) {
                     case Range.ELEMENT:
                         if (hashElement != null && range != null) {
@@ -88,6 +87,7 @@ public class ChecksumProvider extends ExtensionElementProvider<Checksum> {
                         }
                         go = false;
                 }
+                break;
             }
         }
         return new Checksum(creator, name, cb.build());
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java
index a7ee806e3..1eba4075a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2017 Paul Schaub
+ * Copyright 2017 Paul Schaub, 2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,16 @@
  */
 package org.jivesoftware.smackx.jingle_filetransfer.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.hashes.element.HashElement;
 import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
 import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
@@ -34,8 +35,6 @@ import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChi
 import org.jivesoftware.smackx.jingle_filetransfer.element.Range;
 
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Provider for JingleContentDescriptionFileTransfer elements.
@@ -46,20 +45,18 @@ public class JingleFileTransferProvider
     @Override
     public JingleFileTransfer parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
         ArrayList<JingleContentDescriptionChildElement> payloads = new ArrayList<>();
-        boolean inRange = false;
         JingleFileTransferChild.Builder builder = JingleFileTransferChild.getBuilder();
-        HashElement inRangeHash = null;
 
-        int offset = 0;
-        int length = -1;
 
+        String elementName;
         while (true) {
 
-            int tag = parser.nextTag();
-            String elem = parser.getName();
+            XmlPullParser.TagEvent tag = parser.nextTag();
 
-            if (tag == START_TAG) {
-                switch (elem) {
+            switch (tag) {
+            case START_ELEMENT:
+                elementName = parser.getName();
+                switch (elementName) {
                     case JingleFileTransferChild.ELEM_DATE:
                     try {
                         builder.setDate(XmppDateTime.parseXEP0082Date(parser.nextText()));
@@ -85,36 +82,20 @@ public class JingleFileTransferProvider
                         break;
 
                     case Range.ELEMENT:
-                        inRange = true;
-                        String offsetString = parser.getAttributeValue(null, Range.ATTR_OFFSET);
-                        String lengthString = parser.getAttributeValue(null, Range.ATTR_LENGTH);
-                        offset = (offsetString != null ? Integer.parseInt(offsetString) : 0);
-                        length = (lengthString != null ? Integer.parseInt(lengthString) : -1);
+                        Range range = parseRangeElement(parser);
+                        builder.setRange(range);
 
-                        if (parser.isEmptyElementTag()) {
-                            inRange = false;
-                            builder.setRange(new Range(offset, length));
-                        }
                         break;
 
                     case HashElement.ELEMENT:
-                        if (inRange) {
-                            inRangeHash = new HashElementProvider().parse(parser);
-                        } else {
-                            builder.setHash(new HashElementProvider().parse(parser));
-                        }
+                        HashElement hashElement = HashElementProvider.INSTANCE.parse(parser);
+                        builder.setHash(hashElement);
                         break;
                 }
-
-            } else if (tag == END_TAG) {
-                switch (elem) {
-
-                    case Range.ELEMENT:
-                        inRange = false;
-                        builder.setRange(new Range(offset, length, inRangeHash));
-                        inRangeHash = null;
-                        break;
-
+                break;
+            case END_ELEMENT:
+                elementName = parser.getName();
+                switch (elementName) {
                     case JingleFileTransferChild.ELEMENT:
                         payloads.add(builder.build());
                         builder = JingleFileTransferChild.getBuilder();
@@ -123,7 +104,42 @@ public class JingleFileTransferProvider
                     case JingleFileTransfer.ELEMENT:
                         return new JingleFileTransfer(payloads);
                 }
+                break;
             }
         }
     }
+
+    public static Range parseRangeElement(XmlPullParser parser) throws IOException, XmlPullParserException, SmackParsingException {
+        final int initialDepth = parser.getDepth();
+        final Integer offset = ParserUtils.getIntegerAttribute(parser, Range.ATTR_OFFSET);
+        final Integer length = ParserUtils.getIntegerAttribute(parser, Range.ATTR_LENGTH);
+
+        HashElement hashElement = null;
+        outerloop: while (true) {
+            String element;
+            XmlPullParser.Event event = parser.next();
+            switch (event) {
+            case START_ELEMENT:
+                element = parser.getName();
+                switch (element) {
+                case HashElement.ELEMENT:
+                    hashElement = HashElementProvider.INSTANCE.parse(parser);
+                    break;
+                }
+                break;
+            case END_ELEMENT:
+                element = parser.getName();
+                if (element.equals(Range.ELEMENT) && parser.getDepth() == initialDepth) {
+                    break outerloop;
+                }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
+            }
+        }
+
+        return new Range(offset, length, hashElement);
+    }
+
 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java
index deea55e21..5c5f2dc0f 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java
@@ -21,12 +21,11 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.json.packet.AbstractJsonPacketExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public abstract class AbstractJsonExtensionProvider<J extends AbstractJsonPacketExtension> extends ExtensionElementProvider<J> {
 
     @Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
index dd7db3426..692b054fc 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2017-2018 Florian Schmaus, 2016-2017 Fernando Ramirez
+ * Copyright © 2017-2019 Florian Schmaus, 2016-2017 Fernando Ramirez
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import java.util.WeakHashMap;
 
 import org.jivesoftware.smack.ConnectionCreationListener;
@@ -56,7 +56,6 @@ import org.jivesoftware.smackx.rsm.packet.RSMSet;
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityFullJid;
 import org.jxmpp.jid.Jid;
 
@@ -297,7 +296,7 @@ public final class MamManager extends Manager {
         public static final class Builder {
             private String node;
 
-            private final Map<String, FormField> formFields = new HashMap<>(8);
+            private final Map<String, FormField> formFields = new LinkedHashMap<>(8);
 
             private int maxResults = -1;
 
@@ -331,8 +330,9 @@ public final class MamManager extends Manager {
                     return this;
                 }
 
-                FormField formField = new FormField(FORM_FIELD_START);
-                formField.addValue(start);
+                FormField formField = FormField.builder(FORM_FIELD_START)
+                                .addValue(start)
+                                .build();
                 formFields.put(formField.getVariable(), formField);
 
                 FormField endFormField = formFields.get(FORM_FIELD_END);
@@ -358,8 +358,9 @@ public final class MamManager extends Manager {
                     return this;
                 }
 
-                FormField formField = new FormField(FORM_FIELD_END);
-                formField.addValue(end);
+                FormField formField = FormField.builder(FORM_FIELD_END)
+                    .addValue(end)
+                    .build();
                 formFields.put(formField.getVariable(), formField);
 
                 FormField startFormField = formFields.get(FORM_FIELD_START);
@@ -457,7 +458,7 @@ public final class MamManager extends Manager {
 
     public MamQuery queryArchive(MamQueryArgs mamQueryArgs) throws NoResponseException, XMPPErrorException,
                     NotConnectedException, NotLoggedInException, InterruptedException {
-        String queryId = UUID.randomUUID().toString();
+        String queryId = StringUtils.secureUniqueRandomString();
         String node = mamQueryArgs.node;
         DataForm dataForm = mamQueryArgs.getDataForm();
 
@@ -471,17 +472,9 @@ public final class MamManager extends Manager {
     }
 
     private static FormField getWithFormField(Jid withJid) {
-        FormField formField = new FormField(FORM_FIELD_WITH);
-        formField.addValue(withJid.toString());
-        return formField;
-    }
-
-    private static void addWithJid(Jid withJid, DataForm dataForm) {
-        if (withJid == null) {
-            return;
-        }
-        FormField formField = getWithFormField(withJid);
-        dataForm.addField(formField);
+        return FormField.builder(FORM_FIELD_WITH)
+                        .addValue(withJid.toString())
+                        .build();
     }
 
     public MamQuery queryMostRecentPage(Jid jid, int max) throws NoResponseException, XMPPErrorException,
@@ -524,7 +517,7 @@ public final class MamManager extends Manager {
     public List<FormField> retrieveFormFields(String node)
                     throws NoResponseException, XMPPErrorException, NotConnectedException,
             InterruptedException, NotLoggedInException {
-        String queryId = UUID.randomUUID().toString();
+        String queryId = StringUtils.secureUniqueRandomString();
         MamQueryIQ mamQueryIq = new MamQueryIQ(queryId, node, null);
         mamQueryIq.setTo(archiveAddress);
 
@@ -564,6 +557,7 @@ public final class MamManager extends Manager {
      *
      */
     @Deprecated
+    @SuppressWarnings("UnusedVariable")
     public static final class MamQueryResult {
         public final List<Forwarded> forwardedMessages;
         public final MamFinIQ mamFin;
@@ -609,7 +603,8 @@ public final class MamManager extends Manager {
 
         private List<Message> page(RSMSet requestRsmSet) throws NoResponseException, XMPPErrorException,
                         NotConnectedException, NotLoggedInException, InterruptedException {
-            MamQueryIQ mamQueryIQ = new MamQueryIQ(UUID.randomUUID().toString(), node, form);
+            String queryId = StringUtils.secureUniqueRandomString();
+            MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId, node, form);
             mamQueryIQ.setType(IQ.Type.set);
             mamQueryIQ.setTo(archiveAddress);
             mamQueryIQ.addExtension(requestRsmSet);
@@ -700,30 +695,6 @@ public final class MamManager extends Manager {
         }
     }
 
-    private void ensureMamQueryResultMatchesThisManager(MamQueryResult mamQueryResult) {
-        EntityFullJid localAddress = connection().getUser();
-        EntityBareJid localBareAddress = null;
-        if (localAddress != null) {
-            localBareAddress = localAddress.asEntityBareJid();
-        }
-        boolean isLocalUserArchive = archiveAddress == null || archiveAddress.equals(localBareAddress);
-
-        Jid finIqFrom = mamQueryResult.mamFin.getFrom();
-
-        if (finIqFrom != null) {
-            if (finIqFrom.equals(archiveAddress) || (isLocalUserArchive && finIqFrom.equals(localBareAddress))) {
-                return;
-            }
-            throw new IllegalArgumentException("The given MamQueryResult is from the MAM archive '" + finIqFrom
-                            + "' whereas this MamManager is responsible for '" + archiveAddress + '\'');
-        }
-        else if (!isLocalUserArchive) {
-            throw new IllegalArgumentException(
-                            "The given MamQueryResult is from the local entity (user) MAM archive, whereas this MamManager is responsible for '"
-                                            + archiveAddress + '\'');
-        }
-    }
-
     /**
      * Check if this MamManager's archive address supports MAM.
      *
@@ -743,9 +714,7 @@ public final class MamManager extends Manager {
     }
 
     private static DataForm getNewMamForm() {
-        FormField field = new FormField(FormField.FORM_TYPE);
-        field.setType(FormField.Type.hidden);
-        field.addValue(MamElements.NAMESPACE);
+        FormField field = FormField.hiddenFormType(MamElements.NAMESPACE);
         DataForm form = new DataForm(DataForm.Type.submit);
         form.addField(field);
         return form;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java
index a2f8ab42d..1af384165 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamFinIQProvider.java
@@ -22,14 +22,13 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.mam.element.MamFinIQ;
 import org.jivesoftware.smackx.rsm.packet.RSMSet;
 import org.jivesoftware.smackx.rsm.provider.RSMSetProvider;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * MAM Fin IQ Provider class.
  *
@@ -48,18 +47,21 @@ public class MamFinIQProvider extends IQProvider<MamFinIQ> {
         RSMSet rsmSet = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 if (parser.getName().equals(RSMSet.ELEMENT)) {
                     rsmSet = RSMSetProvider.INSTANCE.parse(parser);
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java
index 1cd3b3cfb..632ae4946 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamPrefsIQProvider.java
@@ -22,14 +22,14 @@ import java.util.List;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.mam.element.MamPrefsIQ;
 import org.jivesoftware.smackx.mam.element.MamPrefsIQ.DefaultBehavior;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * MAM Preferences IQ Provider class.
@@ -58,10 +58,10 @@ public class MamPrefsIQProvider extends IQProvider<MamPrefsIQ> {
         List<Jid> neverJids = null;
 
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name) {
                 case "always":
                     alwaysJids = iterateJids(parser);
@@ -71,11 +71,14 @@ public class MamPrefsIQProvider extends IQProvider<MamPrefsIQ> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
@@ -88,10 +91,10 @@ public class MamPrefsIQProvider extends IQProvider<MamPrefsIQ> {
         int initialDepth = parser.getDepth();
 
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name) {
                 case "jid":
                     parser.next();
@@ -99,11 +102,14 @@ public class MamPrefsIQProvider extends IQProvider<MamPrefsIQ> {
                     break;
                 }
                 break;
-            case  XmlPullParser.END_TAG:
+            case  END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java
index 185165c90..853f199f4 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamQueryIQProvider.java
@@ -21,14 +21,13 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.mam.element.MamQueryIQ;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 import org.jivesoftware.smackx.xdata.provider.DataFormProvider;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * MAM Query IQ Provider class.
  *
@@ -47,22 +46,25 @@ public class MamQueryIQProvider extends IQProvider<MamQueryIQ> {
         String node = parser.getAttributeValue("", "node");
 
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
 
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name) {
                 case DataForm.ELEMENT:
                     dataForm = DataFormProvider.INSTANCE.parse(parser);
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java
index f3c502d0e..61d07edf2 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/provider/MamResultProvider.java
@@ -21,14 +21,13 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.forward.packet.Forwarded;
 import org.jivesoftware.smackx.forward.provider.ForwardedProvider;
 import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * MAM Result Provider class.
  *
@@ -46,21 +45,24 @@ public class MamResultProvider extends ExtensionElementProvider<MamResultExtensi
         String id = parser.getAttributeValue("", "id");
 
         outerloop: while (true) {
-            final int eventType = parser.next();
+            final XmlPullParser.Event eventType = parser.next();
             final String name = parser.getName();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (name) {
                 case Forwarded.ELEMENT:
                     forwarded = ForwardedProvider.INSTANCE.parse(parser);
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/provider/MarkupElementProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/provider/MarkupElementProvider.java
index b26cb0982..c7aae6ce1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/provider/MarkupElementProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/provider/MarkupElementProvider.java
@@ -16,9 +16,6 @@
  */
 package org.jivesoftware.smackx.message_markup.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -28,15 +25,15 @@ import java.util.Set;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.message_markup.element.BlockQuoteElement;
 import org.jivesoftware.smackx.message_markup.element.CodeBlockElement;
 import org.jivesoftware.smackx.message_markup.element.ListElement;
 import org.jivesoftware.smackx.message_markup.element.MarkupElement;
 import org.jivesoftware.smackx.message_markup.element.SpanElement;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class MarkupElementProvider extends ExtensionElementProvider<MarkupElement> {
 
     @Override
@@ -51,11 +48,11 @@ public class MarkupElementProvider extends ExtensionElementProvider<MarkupElemen
         List<ListElement.ListEntryElement> lis = new ArrayList<>();
 
         while (true) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
             int start, end;
             switch (tag) {
-                case START_TAG:
+                case START_ELEMENT:
                     switch (name) {
                         case BlockQuoteElement.ELEMENT:
                             start = ParserUtils.getIntegerAttributeOrThrow(parser, BlockQuoteElement.ATTR_START,
@@ -109,7 +106,7 @@ public class MarkupElementProvider extends ExtensionElementProvider<MarkupElemen
                     }
                     break;
 
-                case END_TAG:
+                case END_ELEMENT:
                     switch (name) {
                         case SpanElement.ELEMENT:
                             markup.addSpan(spanStart, spanEnd, spanStyles);
@@ -134,7 +131,11 @@ public class MarkupElementProvider extends ExtensionElementProvider<MarkupElemen
                         case MarkupElement.ELEMENT:
                             return markup.build();
                     }
+                    break;
 
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
     }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java
index b76334aaf..07c271230 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsChangeProvider.java
@@ -21,14 +21,14 @@ import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muclight.MUCLightAffiliation;
 import org.jivesoftware.smackx.muclight.element.MUCLightElements.AffiliationsChangeExtension;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * MUC Light Affiliations Change Provider class.
@@ -45,9 +45,9 @@ public class MUCLightAffiliationsChangeProvider extends ExtensionElementProvider
         String version = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 if (parser.getName().equals("prev-version")) {
                     prevVersion = parser.nextText();
@@ -64,7 +64,7 @@ public class MUCLightAffiliationsChangeProvider extends ExtensionElementProvider
                     affiliations.put(jid, mucLightAffiliation);
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java
index e10fa7869..d35b85fe9 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightAffiliationsIQProvider.java
@@ -21,14 +21,14 @@ import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muclight.MUCLightAffiliation;
 import org.jivesoftware.smackx.muclight.element.MUCLightAffiliationsIQ;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * MUC Light affiliations IQ provider class.
@@ -44,9 +44,9 @@ public class MUCLightAffiliationsIQProvider extends IQProvider<MUCLightAffiliati
         HashMap<Jid, MUCLightAffiliation> occupants = new HashMap<>();
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 if (parser.getName().equals("version")) {
                     version = parser.nextText();
@@ -58,7 +58,7 @@ public class MUCLightAffiliationsIQProvider extends IQProvider<MUCLightAffiliati
                     occupants.put(JidCreate.from(parser.nextText()), affiliation);
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java
index 1f3e46d3c..81f26aacd 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightBlockingIQProvider.java
@@ -22,14 +22,14 @@ import java.util.HashMap;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightBlockingIQ;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * MUC Light blocking IQ provider class.
@@ -45,9 +45,9 @@ public class MUCLightBlockingIQProvider extends IQProvider<MUCLightBlockingIQ> {
         HashMap<Jid, Boolean> users = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 if (parser.getName().equals("room")) {
                     rooms = parseBlocking(parser, rooms);
@@ -57,7 +57,7 @@ public class MUCLightBlockingIQProvider extends IQProvider<MUCLightBlockingIQ> {
                     users = parseBlocking(parser, users);
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java
index a69e2c691..b8eb5558a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationIQProvider.java
@@ -21,13 +21,12 @@ import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration;
 import org.jivesoftware.smackx.muclight.element.MUCLightConfigurationIQ;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * MUC Light configuration IQ provider class.
  *
@@ -44,9 +43,9 @@ public class MUCLightConfigurationIQProvider extends IQProvider<MUCLightConfigur
         HashMap<String, String> customConfigs = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 if (parser.getName().equals("version")) {
                     version = parser.nextText();
@@ -61,7 +60,7 @@ public class MUCLightConfigurationIQProvider extends IQProvider<MUCLightConfigur
                     customConfigs.put(parser.getName(), parser.nextText());
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java
index 3457f212d..af0a0239b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightConfigurationsChangeProvider.java
@@ -21,12 +21,11 @@ import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationsChangeExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * MUC Light configurations change provider class.
  *
@@ -44,9 +43,9 @@ public class MUCLightConfigurationsChangeProvider extends ExtensionElementProvid
         HashMap<String, String> customConfigs = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 if (parser.getName().equals("prev-version")) {
                     prevVersion = parser.nextText();
@@ -63,7 +62,7 @@ public class MUCLightConfigurationsChangeProvider extends ExtensionElementProvid
                     customConfigs.put(parser.getName(), parser.nextText());
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java
index 8718e2141..5d62c5888 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/provider/MUCLightInfoIQProvider.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muclight.MUCLightAffiliation;
 import org.jivesoftware.smackx.muclight.MUCLightRoomConfiguration;
@@ -28,8 +30,6 @@ import org.jivesoftware.smackx.muclight.element.MUCLightInfoIQ;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * MUC Light info IQ provider class.
@@ -48,9 +48,9 @@ public class MUCLightInfoIQProvider extends IQProvider<MUCLightInfoIQ> {
         HashMap<Jid, MUCLightAffiliation> occupants = new HashMap<>();
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 if (parser.getName().equals("version")) {
                     version = parser.nextText();
@@ -62,7 +62,7 @@ public class MUCLightInfoIQProvider extends IQProvider<MUCLightInfoIQ> {
                     outerloop2: while (true) {
                         eventType = parser.next();
 
-                        if (eventType == XmlPullParser.START_TAG) {
+                        if (eventType == XmlPullParser.Event.START_ELEMENT) {
                             if (parser.getName().equals("roomname")) {
                                 roomName = parser.nextText();
                             } else if (parser.getName().equals("subject")) {
@@ -74,7 +74,7 @@ public class MUCLightInfoIQProvider extends IQProvider<MUCLightInfoIQ> {
                                 customConfigs.put(parser.getName(), parser.nextText());
                             }
 
-                        } else if (eventType == XmlPullParser.END_TAG) {
+                        } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                             if (parser.getDepth() == depth) {
                                 break outerloop2;
                             }
@@ -86,7 +86,7 @@ public class MUCLightInfoIQProvider extends IQProvider<MUCLightInfoIQ> {
                     occupants = iterateOccupants(parser);
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -101,14 +101,14 @@ public class MUCLightInfoIQProvider extends IQProvider<MUCLightInfoIQ> {
         int depth = parser.getDepth();
 
         outerloop: while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("user")) {
                     MUCLightAffiliation affiliation = MUCLightAffiliation
                             .fromString(parser.getAttributeValue("", "affiliation"));
                     occupants.put(JidCreate.from(parser.nextText()), affiliation);
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == depth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java
index 5dcf891e2..577b1ab2c 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/EnablePushNotificationsIQ.java
@@ -100,16 +100,19 @@ public class EnablePushNotificationsIQ extends IQ {
         if (publishOptions != null) {
             DataForm dataForm = new DataForm(DataForm.Type.submit);
 
-            FormField formTypeField = new FormField("FORM_TYPE");
+            // TODO: Shouldn't this use some potentially existing PubSub API? Also FORM_TYPE fields are usually of type
+            // 'hidden', but the examples in XEP-0357 do also not set the value to hidden and FORM_TYPE itself appears
+            // to be more convention than specification.
+            FormField.Builder formTypeField = FormField.builder("FORM_TYPE");
             formTypeField.addValue(PubSub.NAMESPACE + "#publish-options");
-            dataForm.addField(formTypeField);
+            dataForm.addField(formTypeField.build());
 
             Iterator<Map.Entry<String, String>> publishOptionsIterator = publishOptions.entrySet().iterator();
             while (publishOptionsIterator.hasNext()) {
                 Map.Entry<String, String> pairVariableValue = publishOptionsIterator.next();
-                FormField field = new FormField(pairVariableValue.getKey());
+                FormField.Builder field = FormField.builder(pairVariableValue.getKey());
                 field.addValue(pairVariableValue.getValue());
-                dataForm.addField(field);
+                dataForm.addField(field.build());
             }
 
             xml.element(dataForm);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java
index 6d4369b7b..a19e53cce 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/provider/RemoteDisablingProvider.java
@@ -20,13 +20,13 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.push_notifications.element.PushNotificationsElements.RemoteDisablingExtension;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Push Notifications Remote Disabling Provider class.
@@ -43,8 +43,8 @@ public class RemoteDisablingProvider extends ExtensionElementProvider<RemoteDisa
         String node = parser.getAttributeValue("", "node");
 
         outerloop: while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("affiliation")) {
                     userJid = JidCreate.from(parser.getAttributeValue("", "jid"));
 
@@ -53,7 +53,7 @@ public class RemoteDisablingProvider extends ExtensionElementProvider<RemoteDisa
                         return null;
                     }
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/ReferenceManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/ReferenceManager.java
index b588aa5e3..780cd51fb 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/ReferenceManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/ReferenceManager.java
@@ -23,6 +23,7 @@ import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPConnectionRegistry;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
 public final class ReferenceManager extends Manager {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java
index 902699344..8519e5def 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java
@@ -25,6 +25,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.reference.ReferenceManager;
 
 import org.jxmpp.jid.BareJid;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/provider/ReferenceProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/provider/ReferenceProvider.java
index d9c710778..349d2c054 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/provider/ReferenceProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/provider/ReferenceProvider.java
@@ -26,10 +26,10 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.util.ParserUtils;
-import org.jivesoftware.smackx.reference.element.ReferenceElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.reference.element.ReferenceElement;
 
 public class ReferenceProvider extends ExtensionElementProvider<ReferenceElement> {
 
@@ -53,8 +53,8 @@ public class ReferenceProvider extends ExtensionElementProvider<ReferenceElement
         }
         ExtensionElement child = null;
         outerloop: while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 String elementName = parser.getName();
                 String namespace = parser.getNamespace();
                 ExtensionElementProvider<?> provider = ProviderManager.getExtensionProvider(elementName, namespace);
@@ -62,7 +62,7 @@ public class ReferenceProvider extends ExtensionElementProvider<ReferenceElement
                     child = provider.parse(parser);
                 }
             }
-            if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 break outerloop;
             }
         }
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdManager.java
index a9fd4fcfa..3afd41632 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdManager.java
@@ -31,6 +31,7 @@ import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.filter.ToTypeFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.sid.element.OriginIdElement;
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java
index b38dc5f38..f7fb1a623 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.sid.element;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.sid.StableUniqueStanzaIdManager;
 
 public class OriginIdElement extends StableAndUniqueIdElement {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StableAndUniqueIdElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StableAndUniqueIdElement.java
index 7c87f4592..3b681a259 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StableAndUniqueIdElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StableAndUniqueIdElement.java
@@ -16,8 +16,6 @@
  */
 package org.jivesoftware.smackx.sid.element;
 
-import java.util.UUID;
-
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.StringUtils;
 
@@ -28,7 +26,7 @@ public abstract class StableAndUniqueIdElement implements ExtensionElement {
     private final String id;
 
     public StableAndUniqueIdElement() {
-        this.id = UUID.randomUUID().toString();
+        this.id = StringUtils.secureUniqueRandomString();
     }
 
     public String getId() {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java
index 0bd2ffd22..77b594c86 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.sid.element;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.sid.StableUniqueStanzaIdManager;
 
 public class StanzaIdElement extends StableAndUniqueIdElement {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/OriginIdProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/OriginIdProvider.java
index 56a92e8b9..166c7d630 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/OriginIdProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/OriginIdProvider.java
@@ -18,9 +18,9 @@ package org.jivesoftware.smackx.sid.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-import org.jivesoftware.smackx.sid.element.OriginIdElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smackx.sid.element.OriginIdElement;
 
 public class OriginIdProvider extends ExtensionElementProvider<OriginIdElement> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java
index 6f336b55c..ce59799df 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java
@@ -18,9 +18,9 @@ package org.jivesoftware.smackx.sid.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-import org.jivesoftware.smackx.sid.element.StanzaIdElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smackx.sid.element.StanzaIdElement;
 
 public class StanzaIdProvider extends ExtensionElementProvider<StanzaIdElement> {
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/SpoilerManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/SpoilerManager.java
index fa5c8680b..a18654cc3 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/SpoilerManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/SpoilerManager.java
@@ -21,6 +21,7 @@ import java.util.WeakHashMap;
 
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.XMPPConnection;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
 public final class SpoilerManager extends Manager {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java
index 1b71b6dba..65bb14e4b 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java
@@ -25,6 +25,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.spoiler.SpoilerManager;
 
 public class SpoilerElement implements ExtensionElement {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/provider/SpoilerProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/provider/SpoilerProvider.java
index 28b7a0506..0755bd9f8 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/provider/SpoilerProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/provider/SpoilerProvider.java
@@ -16,18 +16,15 @@
  */
 package org.jivesoftware.smackx.spoiler.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.TEXT;
-
 import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
-import org.jivesoftware.smackx.spoiler.element.SpoilerElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.spoiler.element.SpoilerElement;
 
 public class SpoilerProvider extends ExtensionElementProvider<SpoilerElement> {
 
@@ -39,13 +36,16 @@ public class SpoilerProvider extends ExtensionElementProvider<SpoilerElement> {
         String hint = null;
 
         outerloop: while (true) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             switch (tag) {
-                case TEXT:
+                case TEXT_CHARACTERS:
                     hint = parser.getText();
                     break;
-                case END_TAG:
+                case END_ELEMENT:
                     break outerloop;
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
         return new SpoilerElement(lang, hint);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
index dff548f50..363edca3f 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java
@@ -16,13 +16,13 @@
  */
 package org.jivesoftware.smackx;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 
 import org.jivesoftware.smack.experimental.ExperimentalInitializer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ExperimentalInitializerTest {
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
index d0dbc2cf9..fb88f6e95 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java
@@ -16,13 +16,15 @@
  */
 package org.jivesoftware.smackx.carbons;
 
-import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequence;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.io.IOException;
 import java.util.Properties;
 
+import org.jivesoftware.smack.test.util.SmackTestUtil;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.ExperimentalInitializerTest;
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
@@ -30,8 +32,9 @@ import org.jivesoftware.smackx.carbons.provider.CarbonManagerProvider;
 import org.jivesoftware.smackx.forward.packet.Forwarded;
 
 import com.jamesmurty.utils.XMLBuilder;
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 public class CarbonTest extends ExperimentalInitializerTest {
 
@@ -65,10 +68,10 @@ public class CarbonTest extends ExperimentalInitializerTest {
         assertEquals(null, fwd.getDelayInformation());
 
         // check message
-        assertThat("romeo@montague.com", equalsCharSequence(fwd.getForwardedStanza().getFrom()));
+        assertEquals("romeo@montague.com", fwd.getForwardedStanza().getFrom().toString());
 
         // check end of tag
-        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.getEventType());
         assertEquals("sent", parser.getName());
     }
 
@@ -91,20 +94,19 @@ public class CarbonTest extends ExperimentalInitializerTest {
         assertEquals(CarbonExtension.Direction.received, cc.getDirection());
 
         // check end of tag
-        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.getEventType());
         assertEquals("received", parser.getName());
     }
 
-    @Test(expected = Exception.class)
-    public void carbonEmptyTest() throws Exception {
-        XmlPullParser parser;
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void carbonEmptyTest(SmackTestUtil.XmlPullParserKind parserKind) throws Exception {
         String control;
 
         control = XMLBuilder.create("sent")
             .a("xmlns", "urn:xmpp:forwarded:0")
             .asString(outputProperties);
 
-        parser = PacketParserUtils.getParserFor(control);
-        new CarbonManagerProvider().parse(parser);
+        assertThrows(IOException.class, () -> SmackTestUtil.parse(control, CarbonManagerProvider.class, parserKind));
     }
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
index 383e3d441..ed8b4fbfa 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java
@@ -16,18 +16,19 @@
  */
 package org.jivesoftware.smackx.chat_markers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.StreamOpen;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.AcknowledgedExtension;
 import org.jivesoftware.smackx.chat_markers.provider.AcknowledgedProvider;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
 
 public class AcknowledgedExtensionTest {
 
@@ -41,18 +42,18 @@ public class AcknowledgedExtensionTest {
         Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster"));
         message.setStanzaId("message-2");
         message.addExtension(new ChatMarkersElements.AcknowledgedExtension("message-1"));
-        Assert.assertEquals(acknowledgedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(acknowledgedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void checkDisplayedProvider() throws Exception {
         XmlPullParser parser = PacketParserUtils.getParserFor(acknowledgedExtension);
         AcknowledgedExtension acknowledgedExtension1 = new AcknowledgedProvider().parse(parser);
-        Assert.assertEquals("message-1", acknowledgedExtension1.getId());
+        assertEquals("message-1", acknowledgedExtension1.getId());
 
         Message message = PacketParserUtils.parseStanza(acknowledgedMessageStanza);
         AcknowledgedExtension acknowledgedExtension2 = AcknowledgedExtension.from(message);
-        Assert.assertEquals("message-1", acknowledgedExtension2.getId());
+        assertEquals("message-1", acknowledgedExtension2.getId());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
index 7cf6daf9a..f4f1295e7 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java
@@ -16,18 +16,19 @@
  */
 package org.jivesoftware.smackx.chat_markers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.StreamOpen;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.DisplayedExtension;
 import org.jivesoftware.smackx.chat_markers.provider.DisplayedProvider;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
 
 public class DisplayedExtensionTest {
 
@@ -41,18 +42,18 @@ public class DisplayedExtensionTest {
         Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster"));
         message.setStanzaId("message-2");
         message.addExtension(new ChatMarkersElements.DisplayedExtension("message-1"));
-        Assert.assertEquals(displayedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(displayedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void checkDisplayedProvider() throws Exception {
         XmlPullParser parser = PacketParserUtils.getParserFor(displayedExtension);
         DisplayedExtension displayedExtension1 = new DisplayedProvider().parse(parser);
-        Assert.assertEquals("message-1", displayedExtension1.getId());
+        assertEquals("message-1", displayedExtension1.getId());
 
         Message message = PacketParserUtils.parseStanza(displayedMessageStanza);
         DisplayedExtension displayedExtension2 = DisplayedExtension.from(message);
-        Assert.assertEquals("message-1", displayedExtension2.getId());
+        assertEquals("message-1", displayedExtension2.getId());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
index 34b201b5e..91944acc1 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java
@@ -16,17 +16,18 @@
  */
 package org.jivesoftware.smackx.chat_markers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.MarkableExtension;
 import org.jivesoftware.smackx.chat_markers.provider.MarkableProvider;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
 
 public class MarkableExtensionTest {
 
@@ -42,18 +43,18 @@ public class MarkableExtensionTest {
         message.setStanzaId("message-1");
         message.setBody("My lord, dispatch; read o'er these articles.");
         message.addExtension(ChatMarkersElements.MarkableExtension.INSTANCE);
-        Assert.assertEquals(markableMessageStanza, message.toXML().toString());
+        assertEquals(markableMessageStanza, message.toXML().toString());
     }
 
     @Test
     public void checkMarkableProvider() throws Exception {
         XmlPullParser parser = PacketParserUtils.getParserFor(markableExtension);
         MarkableExtension markableExtension1 = new MarkableProvider().parse(parser);
-        Assert.assertEquals(markableExtension, markableExtension1.toXML().toString());
+        assertEquals(markableExtension, markableExtension1.toXML().toString());
 
         Message message = PacketParserUtils.parseStanza(markableMessageStanza);
         MarkableExtension markableExtension2 = MarkableExtension.from(message);
-        Assert.assertEquals(markableExtension, markableExtension2.toXML().toString());
+        assertEquals(markableExtension, markableExtension2.toXML().toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
index 417c95471..be80449b9 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java
@@ -16,18 +16,19 @@
  */
 package org.jivesoftware.smackx.chat_markers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.StreamOpen;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements.ReceivedExtension;
 import org.jivesoftware.smackx.chat_markers.provider.ReceivedProvider;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
 
 public class ReceivedExtensionTest {
 
@@ -41,18 +42,18 @@ public class ReceivedExtensionTest {
         Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster"));
         message.setStanzaId("message-2");
         message.addExtension(new ChatMarkersElements.ReceivedExtension("message-1"));
-        Assert.assertEquals(receivedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(receivedMessageStanza, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void checkReceivedProvider() throws Exception {
         XmlPullParser parser = PacketParserUtils.getParserFor(receivedExtension);
         ReceivedExtension receivedExtension1 = new ReceivedProvider().parse(parser);
-        Assert.assertEquals("message-1", receivedExtension1.getId());
+        assertEquals("message-1", receivedExtension1.getId());
 
         Message message = PacketParserUtils.parseStanza(receivedMessageStanza);
         ReceivedExtension receivedExtension2 = ReceivedExtension.from(message);
-        Assert.assertEquals("message-1", receivedExtension2.getId());
+        assertEquals("message-1", receivedExtension2.getId());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/colors/ConsistentColorsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/colors/ConsistentColorsTest.java
index debdfa0e7..612c2816a 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/colors/ConsistentColorsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/colors/ConsistentColorsTest.java
@@ -16,14 +16,14 @@
  */
 package org.jivesoftware.smackx.colors;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 
 import org.jivesoftware.smackx.colors.ConsistentColor.Deficiency;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ConsistentColorsTest extends SmackTestSuite {
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionElementTest.java
index ed0aeec5b..3d1cd04df 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionElementTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/ExplicitMessageEncryptionElementTest.java
@@ -16,19 +16,20 @@
  */
 package org.jivesoftware.smackx.eme;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ExplicitMessageEncryptionElementTest extends SmackTestSuite {
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java
index 3599924fd..1060dfc6e 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/eme/provider/ExplicitMessageEncryptionProviderTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2017 Florian Schmaus
+ * Copyright 2017-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,19 @@
  */
 package org.jivesoftware.smackx.eme.provider;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.jivesoftware.smack.test.util.TestUtils;
+import java.io.IOException;
+
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement.ExplicitMessageEncryptionProtocol;
 
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 public class ExplicitMessageEncryptionProviderTest {
 
@@ -34,15 +39,19 @@ public class ExplicitMessageEncryptionProviderTest {
     private static final String UNKNOWN_EME_ELEMENT = "<encryption xmlns='urn:xmpp:eme:0' namespace='" + UNKNOWN_NAMESPACE
                     + "' name='" + UNKNOWN_NAME + "'/>";
 
-    @Test
-    public void testParseOxEmeElement() throws Exception {
-        ExplicitMessageEncryptionElement eme = TestUtils.parseExtensionElement(OX_EME_ELEMENT);
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testParseOxEmeElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        ExplicitMessageEncryptionElement eme = SmackTestUtil.parse(OX_EME_ELEMENT, ExplicitMessageEncryptionProvider.class, parserKind);
         assertEquals(ExplicitMessageEncryptionProtocol.openpgpV0, eme.getProtocol());
     }
 
-    @Test
-    public void testParseUnknownEmeElement() throws Exception {
-        ExplicitMessageEncryptionElement eme = TestUtils.parseExtensionElement(UNKNOWN_EME_ELEMENT);
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testParseUnknownEmeElement(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        ExplicitMessageEncryptionElement eme = SmackTestUtil.parse(UNKNOWN_EME_ELEMENT, ExplicitMessageEncryptionProvider.class, parserKind);
         assertEquals(UNKNOWN_NAMESPACE, eme.getEncryptionNamespace());
         assertEquals(UNKNOWN_NAME, eme.getName());
     }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java
index e67342a9e..1605b80d2 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java
@@ -16,11 +16,13 @@
  */
 package org.jivesoftware.smackx.hashes;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertTrue;
 import static org.jivesoftware.smackx.hashes.HashManager.ALGORITHM.SHA_256;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.charset.StandardCharsets;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
@@ -29,7 +31,7 @@ import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.hashes.element.HashElement;
 import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test toXML and parse of HashElement and HashElementProvider.
@@ -53,7 +55,7 @@ public class HashElementTest extends SmackTestSuite {
         assertTrue(element.equals(parsed));
 
         HashElement other = new HashElement(HashManager.ALGORITHM.SHA_512,
-                "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8".getBytes(StringUtils.UTF8));
+                "861844d6704e8573fec34d967e20bcfef3d424cf48be04e6dc08f2bd58c729743371015ead891cc3cf1c9d34b49264b510751b1ff9e537937bc46b5d6ff4ecc8".getBytes(StandardCharsets.UTF_8));
         assertFalse(element.equals(other));
     }
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java
index 44ae4fdc5..355f1a45a 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashTest.java
@@ -16,12 +16,12 @@
  */
 package org.jivesoftware.smackx.hashes;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.StringUtils;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test HashManager functionality.
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java
index 4155a6f48..5af9ff08c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java
@@ -16,15 +16,20 @@
  */
 package org.jivesoftware.smackx.hoxt.provider;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.hoxt.packet.AbstractHttpOverXmpp;
 import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq;
@@ -32,8 +37,9 @@ import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp;
 import org.jivesoftware.smackx.shim.packet.Header;
 import org.jivesoftware.smackx.shim.packet.HeadersExtension;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 /**
  * Tests correct headers and data parsing in 'req' and 'resp' elements.
@@ -84,8 +90,10 @@ public class AbstractHttpOverXmppProviderTest {
         checkHeaders(body.getHeaders(), expectedHeaders);
     }
 
-    @Test
-    public void isTextDataParsedCorrectly() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void isTextDataParsedCorrectly(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         String expectedText = "@prefix dc: <http://purl.org/dc/elements/1.1/>."
                 + "@base <http://clayster.com/>."
                 + "<xep> dc:title \"HTTP over XMPP\";"
@@ -103,12 +111,14 @@ public class AbstractHttpOverXmppProviderTest {
                 + "</text></data></resp>";
 
         AbstractHttpOverXmpp.Text text = (AbstractHttpOverXmpp.Text) parseAbstractBody(
-                string, "resp").getData().getChild();
+                string, "resp", parserKind).getData().getChild();
         assertEquals(expectedText, text.getText());
     }
 
-    @Test
-    public void isXmlDataParsedCorrectly() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void isXmlDataParsedCorrectly(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         String expectedXml = "<sparql><head><variable name=\"title\"/><variable name=\"creator\"/>" // no xmlns here
                 + "</head><results><result>"
                 + "<binding name=\"title\">"
@@ -137,12 +147,14 @@ public class AbstractHttpOverXmppProviderTest {
                 + encodedXml
                 + "</xml></data></resp>";
         AbstractHttpOverXmpp.Xml xmlProviderValue = (AbstractHttpOverXmpp.Xml) parseAbstractBody(
-                string, "resp").getData().getChild();
+                string, "resp", parserKind).getData().getChild();
         assertEquals(expectedXml, xmlProviderValue.getText());
     }
 
-    @Test
-    public void isBase64DataParsedCorrectly() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void isBase64DataParsedCorrectly(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         String base64Data = "iVBORw0KGgoAAAANSUhEUgAAASwAAAGQCAYAAAAUdV17AAAAAXNSR0 ... tVWJd+e+y1AAAAABJRU5ErkJggg==";
         String string = "<resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>"
                 + "<headers xmlns='http://jabber.org/protocol/shim'><header name='Server'>Clayster</header></headers>"
@@ -150,12 +162,14 @@ public class AbstractHttpOverXmppProviderTest {
                 + base64Data
                 + "</base64></data></resp>";
         AbstractHttpOverXmpp.Base64 base64ProviderValue = (AbstractHttpOverXmpp.Base64) parseAbstractBody(
-                string, "resp").getData().getChild();
+                string, "resp", parserKind).getData().getChild();
         assertEquals(base64Data, base64ProviderValue.getText());
     }
 
-    @Test
-    public void isChunkedBase64DataParsedCorrectly() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void isChunkedBase64DataParsedCorrectly(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         String streamId = "Stream0001";
         String chunkBase64Data = "  <chunkedBase64 streamId='" + streamId + "'/>";
         String string = "<resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>"
@@ -164,12 +178,14 @@ public class AbstractHttpOverXmppProviderTest {
                 + chunkBase64Data
                 + "</data></resp>";
         AbstractHttpOverXmpp.ChunkedBase64 chunkedBase64Value = (AbstractHttpOverXmpp.ChunkedBase64) parseAbstractBody(
-                string, "resp").getData().getChild();
+                string, "resp", parserKind).getData().getChild();
         assertEquals(streamId, chunkedBase64Value.getStreamId());
     }
 
-    @Test
-    public void isIbbDataParsedCorrectly() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void isIbbDataParsedCorrectly(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         String sid = "Stream0002";
         String ibbData = "  <ibb sid='" + sid + "'/>";
         String string = "<resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>"
@@ -178,14 +194,16 @@ public class AbstractHttpOverXmppProviderTest {
                 + ibbData
                 + "</data></resp>";
         AbstractHttpOverXmpp.Ibb ibbValue = (AbstractHttpOverXmpp.Ibb) parseAbstractBody(
-                string, "resp").getData().getChild();
+                string, "resp", parserKind).getData().getChild();
         assertEquals(sid, ibbValue.getSid());
     }
 
     // TODO The method name makes no sense after the HOXT re-design, change to parseHttpOverXmppResp()
-    private static HttpOverXmppResp parseAbstractBody(String string, String tag) throws Exception {
+    private static HttpOverXmppResp parseAbstractBody(String string, String tag,
+                    SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         HttpOverXmppRespProvider provider = new HttpOverXmppRespProvider();
-        XmlPullParser parser = PacketParserUtils.getParserFor(string, tag);
+        XmlPullParser parser = SmackTestUtil.getParserFor(string, tag, parserKind);
 
         IQ iq = provider.parse(parser);
         assertTrue(iq instanceof HttpOverXmppResp);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java
index 9845e0ecc..f443db501 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java
@@ -16,17 +16,17 @@
  */
 package org.jivesoftware.smackx.hoxt.provider;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.hoxt.packet.Base64BinaryChunk;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests correct parsing of 'chunk' elements in Message stanza.
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
index d64427dde..e5d3e1e54 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java
@@ -16,17 +16,17 @@
  */
 package org.jivesoftware.smackx.hoxt.provider;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.hoxt.packet.HttpMethod;
 import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 public class HttpOverXmppReqProviderTest {
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java
index 3001eb844..d0a80ed14 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java
@@ -16,17 +16,17 @@
  */
 package org.jivesoftware.smackx.hoxt.provider;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppResp;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests correct attribute parsing in 'resp' element.
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
index eb7333b6d..566ca03c3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java
@@ -16,10 +16,11 @@
  */
 package org.jivesoftware.smackx.httpfileupload;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FileTooLargeErrorCreateTest {
     private static final String fileTooLargeErrorExtensionExample
@@ -31,8 +32,8 @@ public class FileTooLargeErrorCreateTest {
     public void checkFileTooLargeErrorExtensionCreation() {
         FileTooLargeError fileTooLargeError = new FileTooLargeError(20000);
 
-        Assert.assertEquals(20000, fileTooLargeError.getMaxFileSize());
-        Assert.assertEquals(fileTooLargeErrorExtensionExample, fileTooLargeError.toXML().toString());
+        assertEquals(20000, fileTooLargeError.getMaxFileSize());
+        assertEquals(fileTooLargeErrorExtensionExample, fileTooLargeError.toXML().toString());
 
     }
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
index 73b71d93d..3dc287098 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotCreateTest.java
@@ -16,15 +16,15 @@
  */
 package org.jivesoftware.smackx.httpfileupload;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.net.URL;
 
 import org.jivesoftware.smackx.httpfileupload.element.Slot;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
 
 public class SlotCreateTest {
@@ -39,11 +39,11 @@ public class SlotCreateTest {
         Slot slot = new Slot(new URL("https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
                 new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"));
 
-        Assert.assertEquals(new URL("https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
+        assertEquals(new URL("https://upload.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
                 slot.getPutUrl());
-        Assert.assertEquals(new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
+        assertEquals(new URL("https://download.montague.tld/4a771ac1-f0b2-4a4a-9700-f2a26fa2bb67/my_juliet.png"),
                 slot.getGetUrl());
 
-        assertXMLEqual(testSlot, slot.getChildElementXML().toString());
+        assertXmlSimilar(testSlot, slot.getChildElementXML().toString());
     }
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
index d49ebee73..e30a60c99 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/SlotRequestCreateTest.java
@@ -16,14 +16,15 @@
  */
 package org.jivesoftware.smackx.httpfileupload;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 
 import org.jivesoftware.smackx.httpfileupload.element.SlotRequest;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.JidTestUtil;
 import org.xml.sax.SAXException;
 
@@ -46,31 +47,33 @@ public class SlotRequestCreateTest {
     public void checkSlotRequestCreation() throws SAXException, IOException {
         SlotRequest slotRequest = new SlotRequest(JidTestUtil.DOMAIN_BARE_JID_1, "my_juliet.png", 23456, "image/jpeg");
 
-        Assert.assertEquals("my_juliet.png", slotRequest.getFilename());
-        Assert.assertEquals(23456, slotRequest.getSize());
-        Assert.assertEquals("image/jpeg", slotRequest.getContentType());
+        assertEquals("my_juliet.png", slotRequest.getFilename());
+        assertEquals(23456, slotRequest.getSize());
+        assertEquals("image/jpeg", slotRequest.getContentType());
 
-        assertXMLEqual(testRequest, slotRequest.getChildElementXML().toString());
+        assertXmlSimilar(testRequest, slotRequest.getChildElementXML().toString());
     }
 
     @Test
     public void checkSlotRequestCreationWithoutContentType() throws SAXException, IOException {
         SlotRequest slotRequest = new SlotRequest(JidTestUtil.DOMAIN_BARE_JID_1, "my_romeo.png", 52523);
 
-        Assert.assertEquals("my_romeo.png", slotRequest.getFilename());
-        Assert.assertEquals(52523, slotRequest.getSize());
-        Assert.assertEquals(null, slotRequest.getContentType());
+        assertEquals("my_romeo.png", slotRequest.getFilename());
+        assertEquals(52523, slotRequest.getSize());
+        assertEquals(null, slotRequest.getContentType());
 
-        assertXMLEqual(testRequestWithoutContentType, slotRequest.getChildElementXML().toString());
+        assertXmlSimilar(testRequestWithoutContentType, slotRequest.getChildElementXML().toString());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void checkSlotRequestCreationNegativeSize() {
-        new SlotRequest(JidTestUtil.DOMAIN_BARE_JID_1, "my_juliet.png", -23456, "image/jpeg");
+        assertThrows(IllegalArgumentException.class, () ->
+        new SlotRequest(JidTestUtil.DOMAIN_BARE_JID_1, "my_juliet.png", -23456, "image/jpeg"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void checkSlotRequestCreationZeroSize() {
-        new SlotRequest(JidTestUtil.DOMAIN_BARE_JID_1, "my_juliet.png", 0, "image/jpeg");
+        assertThrows(IllegalArgumentException.class, () ->
+        new SlotRequest(JidTestUtil.DOMAIN_BARE_JID_1, "my_juliet.png", 0, "image/jpeg"));
     }
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java
index 5983baeec..8b8dce4f1 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/FileTooLargeErrorProviderTest.java
@@ -16,13 +16,14 @@
  */
 package org.jivesoftware.smackx.httpfileupload.provider;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.httpfileupload.element.FileTooLargeError;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FileTooLargeErrorProviderTest {
 
@@ -52,9 +53,9 @@ public class FileTooLargeErrorProviderTest {
     public void checkSlotErrorFileToLarge() throws Exception {
         IQ fileTooLargeErrorIQ = PacketParserUtils.parseStanza(slotErrorFileToLarge);
 
-        Assert.assertEquals(IQ.Type.error, fileTooLargeErrorIQ.getType());
+        assertEquals(IQ.Type.error, fileTooLargeErrorIQ.getType());
 
         FileTooLargeError fileTooLargeError = FileTooLargeError.from(fileTooLargeErrorIQ);
-        Assert.assertEquals(20000, fileTooLargeError.getMaxFileSize());
+        assertEquals(20000, fileTooLargeError.getMaxFileSize());
     }
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java
index 0cd8bc305..17c85f32d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java
@@ -16,8 +16,8 @@
  */
 package org.jivesoftware.smackx.httpfileupload.provider;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.assertEquals;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -28,7 +28,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.httpfileupload.element.Slot;
 import org.jivesoftware.smackx.httpfileupload.element.Slot_V0_2;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SlotProviderTest {
 
@@ -69,7 +69,7 @@ public class SlotProviderTest {
 
         checkUrls(slot);
 
-        assertXMLEqual(SLOT_IQ, slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(SLOT_IQ, slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     private static final String SLOT_V0_2_IQ =
@@ -90,7 +90,7 @@ public class SlotProviderTest {
         checkUrls(slot);
 
         String slotXml = slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString();
-        assertXMLEqual(SLOT_V0_2_IQ, slotXml);
+        assertXmlSimilar(SLOT_V0_2_IQ, slotXml);
     }
 
     private static final String SLOT_WITH_HEADERS_IQ =
@@ -114,7 +114,7 @@ public class SlotProviderTest {
         checkUrls(slot);
 
         String slotXml = slot.toXML(StreamOpen.CLIENT_NAMESPACE).toString();
-        assertXMLEqual(SLOT_WITH_HEADERS_IQ, slotXml);
+        assertXmlSimilar(SLOT_WITH_HEADERS_IQ, slotXml);
     }
 
     private static void checkUrls(Slot slot) {
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java
index 71aeb7e5b..738906053 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.mam;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.mam.MamManager.MamQueryArgs;
 import org.jivesoftware.smackx.mam.element.MamElements;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.JidTestUtil;
 import org.jxmpp.util.XmppDateTime;
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
index fb8bbf95d..f0cd5df68 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamFinProviderTest.java
@@ -16,17 +16,21 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.mam.element.MamFinIQ;
 import org.jivesoftware.smackx.mam.provider.MamFinIQProvider;
 import org.jivesoftware.smackx.rsm.packet.RSMSet;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 public class MamFinProviderTest extends MamTest {
 
@@ -39,13 +43,13 @@ public class MamFinProviderTest extends MamTest {
         XmlPullParser parser = PacketParserUtils.getParserFor(exmapleMamFinXml);
         MamFinIQ mamFinIQ = new MamFinIQProvider().parse(parser);
 
-        Assert.assertFalse(mamFinIQ.isComplete());
-        Assert.assertTrue(mamFinIQ.isStable());
-        Assert.assertNull(mamFinIQ.getQueryId());
+        assertFalse(mamFinIQ.isComplete());
+        assertTrue(mamFinIQ.isStable());
+        assertNull(mamFinIQ.getQueryId());
 
         RSMSet rsmSet = mamFinIQ.getRSMSet();
-        Assert.assertEquals(rsmSet.getAfter(), "09af3-cc343-b409f");
-        Assert.assertEquals(rsmSet.getMax(), 10);
+        assertEquals(rsmSet.getAfter(), "09af3-cc343-b409f");
+        assertEquals(rsmSet.getMax(), 10);
     }
 
     @Test
@@ -64,13 +68,13 @@ public class MamFinProviderTest extends MamTest {
         IQ iq = PacketParserUtils.parseStanza(IQ_LIMITED_RESULTS_EXAMPLE);
 
         MamFinIQ mamFinIQ = (MamFinIQ) iq;
-        Assert.assertEquals(mamFinIQ.getType(), Type.result);
+        assertEquals(mamFinIQ.getType(), Type.result);
 
-        Assert.assertTrue(mamFinIQ.isComplete());
-        Assert.assertEquals(mamFinIQ.getRSMSet().getCount(), 16);
-        Assert.assertEquals(mamFinIQ.getRSMSet().getFirst(), "23452-4534-1");
-        Assert.assertEquals(mamFinIQ.getRSMSet().getFirstIndex(), 0);
-        Assert.assertEquals(mamFinIQ.getRSMSet().getLast(), "390-2342-22");
+        assertTrue(mamFinIQ.isComplete());
+        assertEquals(mamFinIQ.getRSMSet().getCount(), 16);
+        assertEquals(mamFinIQ.getRSMSet().getFirst(), "23452-4534-1");
+        assertEquals(mamFinIQ.getRSMSet().getFirstIndex(), 0);
+        assertEquals(mamFinIQ.getRSMSet().getLast(), "390-2342-22");
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
index 0e89b9b69..1c0ff85f8 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamPrefIQProviderTest.java
@@ -16,18 +16,20 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.List;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.mam.element.MamPrefsIQ;
 import org.jivesoftware.smackx.mam.provider.MamPrefsIQProvider;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
 
 public class MamPrefIQProviderTest extends MamTest {
 
@@ -52,20 +54,20 @@ public class MamPrefIQProviderTest extends MamTest {
         XmlPullParser parser1 = PacketParserUtils.getParserFor(exampleMamPrefsIQ1);
         MamPrefsIQ mamPrefIQ1 = new MamPrefsIQProvider().parse(parser1);
 
-        Assert.assertEquals(IQ.Type.set, mamPrefIQ1.getType());
-        Assert.assertEquals(mamPrefIQ1.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
-        Assert.assertEquals(mamPrefIQ1.getNeverJids().get(0).toString(), "montague@montague.lit");
+        assertEquals(IQ.Type.set, mamPrefIQ1.getType());
+        assertEquals(mamPrefIQ1.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
+        assertEquals(mamPrefIQ1.getNeverJids().get(0).toString(), "montague@montague.lit");
 
         XmlPullParser parser2 = PacketParserUtils.getParserFor(exampleMamPrefsIQ2);
         MamPrefsIQ mamPrefIQ2 = new MamPrefsIQProvider().parse(parser2);
-        Assert.assertEquals(IQ.Type.set, mamPrefIQ2.getType());
-        Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
-        Assert.assertEquals(mamPrefIQ2.getAlwaysJids().get(1).toString(), "montague@montague.lit");
-        Assert.assertTrue(mamPrefIQ2.getNeverJids().isEmpty());
+        assertEquals(IQ.Type.set, mamPrefIQ2.getType());
+        assertEquals(mamPrefIQ2.getAlwaysJids().get(0).toString(), "romeo@montague.lit");
+        assertEquals(mamPrefIQ2.getAlwaysJids().get(1).toString(), "montague@montague.lit");
+        assertTrue(mamPrefIQ2.getNeverJids().isEmpty());
 
         XmlPullParser parser3 = PacketParserUtils.getParserFor(exampleMamPrefsIQ3);
         MamPrefsIQ mamPrefIQ3 = new MamPrefsIQProvider().parse(parser3);
-        Assert.assertEquals(IQ.Type.set, mamPrefIQ3.getType());
+        assertEquals(IQ.Type.set, mamPrefIQ3.getType());
     }
 
     @Test
@@ -77,10 +79,10 @@ public class MamPrefIQProviderTest extends MamTest {
         List<Jid> alwaysJids = mamPrefsIQ.getAlwaysJids();
         List<Jid> neverJids = mamPrefsIQ.getNeverJids();
 
-        Assert.assertEquals(alwaysJids.size(), 1);
-        Assert.assertEquals(neverJids.size(), 2);
-        Assert.assertEquals(alwaysJids.get(0).toString(), "romeo@montague.lit");
-        Assert.assertEquals(neverJids.get(1).toString(), "montague@montague.lit");
+        assertEquals(alwaysJids.size(), 1);
+        assertEquals(neverJids.size(), 2);
+        assertEquals(alwaysJids.get(0).toString(), "romeo@montague.lit");
+        assertEquals(neverJids.get(1).toString(), "montague@montague.lit");
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
index e1d70b581..f39411a00 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamQueryIQProviderTest.java
@@ -16,6 +16,10 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,8 +31,7 @@ import org.jivesoftware.smackx.mam.element.MamQueryIQ;
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MamQueryIQProviderTest {
 
@@ -54,35 +57,35 @@ public class MamQueryIQProviderTest {
         IQ iq1 = PacketParserUtils.parseStanza(exampleMamQueryIQ1);
         MamQueryIQ mamQueryIQ1 = (MamQueryIQ) iq1;
 
-        Assert.assertEquals(mamQueryIQ1.getType(), Type.set);
-        Assert.assertEquals(mamQueryIQ1.getQueryId(), "test");
+        assertEquals(mamQueryIQ1.getType(), Type.set);
+        assertEquals(mamQueryIQ1.getQueryId(), "test");
 
         DataForm dataForm1 = (DataForm) mamQueryIQ1.getExtension(DataForm.NAMESPACE);
-        Assert.assertEquals(dataForm1.getType(), DataForm.Type.submit);
+        assertEquals(dataForm1.getType(), DataForm.Type.submit);
 
         List<FormField> fields1 = dataForm1.getFields();
-        Assert.assertEquals(fields1.get(0).getType(), FormField.Type.hidden);
-        Assert.assertEquals(fields1.get(1).getType(), FormField.Type.text_single);
-        Assert.assertEquals(fields1.get(1).getValues().get(0).toString(), "Where arth thou, my Juliet?");
-        Assert.assertEquals(fields1.get(2).getValues().get(0).toString(), "{http://jabber.org/protocol/mood}mood/lonely");
+        assertEquals(fields1.get(0).getType(), FormField.Type.hidden);
+        assertEquals(fields1.get(1).getType(), FormField.Type.text_single);
+        assertEquals(fields1.get(1).getValues().get(0).toString(), "Where arth thou, my Juliet?");
+        assertEquals(fields1.get(2).getValues().get(0).toString(), "{http://jabber.org/protocol/mood}mood/lonely");
 
         // example2
         IQ iq2 = PacketParserUtils.parseStanza(exampleMamQueryIQ2);
         MamQueryIQ mamQueryIQ2 = (MamQueryIQ) iq2;
 
-        Assert.assertEquals(mamQueryIQ2.getType(), Type.result);
-        Assert.assertNull(mamQueryIQ2.getQueryId());
+        assertEquals(mamQueryIQ2.getType(), Type.result);
+        assertNull(mamQueryIQ2.getQueryId());
 
         DataForm dataForm2 = (DataForm) mamQueryIQ2.getExtension(DataForm.NAMESPACE);
-        Assert.assertEquals(dataForm2.getType(), DataForm.Type.form);
+        assertEquals(dataForm2.getType(), DataForm.Type.form);
 
         List<FormField> fields2 = dataForm2.getFields();
-        Assert.assertEquals(fields2.get(0).getValues().get(0).toString(), "urn:xmpp:mam:1");
-        Assert.assertTrue(fields2.get(0).getValues().size() == 1);
-        Assert.assertEquals(fields2.get(1).getType(), FormField.Type.jid_single);
-        Assert.assertEquals(fields2.get(2).getType(), FormField.Type.text_single);
-        Assert.assertEquals(fields2.get(2).getValues(), new ArrayList<>());
-        Assert.assertEquals(fields2.get(4).getVariable(), "urn:example:xmpp:free-text-search");
+        assertEquals(fields2.get(0).getValues().get(0).toString(), "urn:xmpp:mam:1");
+        assertTrue(fields2.get(0).getValues().size() == 1);
+        assertEquals(fields2.get(1).getType(), FormField.Type.jid_single);
+        assertEquals(fields2.get(2).getType(), FormField.Type.text_single);
+        assertEquals(fields2.get(2).getValues(), new ArrayList<>());
+        assertEquals(fields2.get(4).getVariable(), "urn:example:xmpp:free-text-search");
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
index 4d0c0c145..7fbcd7c7e 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamResultProviderTest.java
@@ -16,26 +16,27 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.forward.packet.Forwarded;
 import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension;
 import org.jivesoftware.smackx.mam.provider.MamResultProvider;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 public class MamResultProviderTest {
 
     private static final String exampleMamResultXml = "<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>"
             + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>"
-            + "<message xmlns='jabber:client'" + "to='juliet@capulet.lit/balcony'" + "from='romeo@montague.lit/orchard'"
+            + "<message xmlns='jabber:client' to='juliet@capulet.lit/balcony' from='romeo@montague.lit/orchard' "
             + "type='chat'>"
             + "<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>"
             + "</message>" + "</forwarded>" + "</result>";
@@ -51,20 +52,20 @@ public class MamResultProviderTest {
         XmlPullParser parser = PacketParserUtils.getParserFor(exampleMamResultXml);
         MamResultExtension mamResultExtension = new MamResultProvider().parse(parser);
 
-        Assert.assertEquals(mamResultExtension.getQueryId(), "f27");
-        Assert.assertEquals(mamResultExtension.getId(), "28482-98726-73623");
+        assertEquals(mamResultExtension.getQueryId(), "f27");
+        assertEquals(mamResultExtension.getId(), "28482-98726-73623");
 
         GregorianCalendar calendar = new GregorianCalendar(2010, 7 - 1, 10, 23, 8, 25);
         calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
         Date date = calendar.getTime();
 
         Forwarded forwarded = mamResultExtension.getForwarded();
-        Assert.assertEquals(forwarded.getDelayInformation().getStamp(), date);
+        assertEquals(forwarded.getDelayInformation().getStamp(), date);
 
         Message message = (Message) forwarded.getForwardedStanza();
-        Assert.assertEquals(message.getFrom().toString(), "romeo@montague.lit/orchard");
-        Assert.assertEquals(message.getTo().toString(), "juliet@capulet.lit/balcony");
-        Assert.assertEquals(message.getBody(),
+        assertEquals(message.getFrom().toString(), "romeo@montague.lit/orchard");
+        assertEquals(message.getTo().toString(), "juliet@capulet.lit/balcony");
+        assertEquals(message.getBody(),
                 "Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.");
     }
 
@@ -73,20 +74,20 @@ public class MamResultProviderTest {
         Message message = PacketParserUtils.parseStanza(exampleResultMessage);
         MamResultExtension mamResultExtension = MamResultExtension.from(message);
 
-        Assert.assertEquals(mamResultExtension.getQueryId(), "f27");
-        Assert.assertEquals(mamResultExtension.getId(), "28482-98726-73623");
+        assertEquals(mamResultExtension.getQueryId(), "f27");
+        assertEquals(mamResultExtension.getId(), "28482-98726-73623");
 
         GregorianCalendar calendar = new GregorianCalendar(2010, 7 - 1, 10, 23, 8, 25);
         calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
         Date date = calendar.getTime();
 
         Forwarded forwarded = mamResultExtension.getForwarded();
-        Assert.assertEquals(forwarded.getDelayInformation().getStamp(), date);
+        assertEquals(forwarded.getDelayInformation().getStamp(), date);
 
         Message forwardedMessage = (Message) forwarded.getForwardedStanza();
-        Assert.assertEquals(forwardedMessage.getFrom().toString(), "witch@shakespeare.lit");
-        Assert.assertEquals(forwardedMessage.getTo().toString(), "macbeth@shakespeare.lit");
-        Assert.assertEquals(forwardedMessage.getBody(), "Hail to thee");
+        assertEquals(forwardedMessage.getFrom().toString(), "witch@shakespeare.lit");
+        assertEquals(forwardedMessage.getTo().toString(), "macbeth@shakespeare.lit");
+        assertEquals(forwardedMessage.getBody(), "Hail to thee");
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java
index 494654a91..9c79c34e3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/MamTest.java
@@ -25,16 +25,16 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeAll;
 
 public class MamTest extends InitExtensions {
 
-    protected XMPPConnection connection;
-    protected String queryId;
-    protected MamManager mamManager;
+    protected static XMPPConnection connection;
+    protected static String queryId;
+    protected static MamManager mamManager;
 
-    @Before
-    public void setup() {
+    @BeforeAll
+    public static void setup() {
         // mock connection
         connection = new DummyConnection();
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java
index 635dcecb2..91487e62a 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StreamOpen;
 
@@ -23,8 +25,7 @@ import org.jivesoftware.smackx.mam.element.MamQueryIQ;
 import org.jivesoftware.smackx.rsm.packet.RSMSet;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PagingTest extends MamTest {
 
@@ -44,9 +45,9 @@ public class PagingTest extends MamTest {
         mamQueryIQ.setType(IQ.Type.set);
         mamQueryIQ.addExtension(rsmSet);
 
-        Assert.assertEquals(mamQueryIQ.getDataForm(), dataForm);
-        Assert.assertEquals(mamQueryIQ.getDataForm().getFields().get(0).getValues().get(0).toString(), "urn:xmpp:mam:1");
-        Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), pagingStanza);
+        assertEquals(mamQueryIQ.getDataForm(), dataForm);
+        assertEquals(mamQueryIQ.getDataForm().getFields().get(0).getValues().get(0).toString(), "urn:xmpp:mam:1");
+        assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), pagingStanza);
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
index c251492ff..2e80871bc 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,8 +27,7 @@ import org.jivesoftware.smackx.mam.element.MamElements;
 import org.jivesoftware.smackx.mam.element.MamPrefsIQ;
 import org.jivesoftware.smackx.mam.element.MamPrefsIQ.DefaultBehavior;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
@@ -43,7 +44,7 @@ public class PreferencesTest {
     public void checkRetrievePrefsStanza() throws Exception {
         MamPrefsIQ mamPrefIQ = new MamPrefsIQ();
         mamPrefIQ.setStanzaId("sarasa");
-        Assert.assertEquals(mamPrefIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), retrievePrefsStanzaExample);
+        assertEquals(mamPrefIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), retrievePrefsStanzaExample);
     }
 
     @Test
@@ -57,7 +58,7 @@ public class PreferencesTest {
 
         MamPrefsIQ mamPrefIQ =  new MamPrefsIQ(alwaysJids, neverJids, DefaultBehavior.roster);
         mamPrefIQ.setStanzaId("sarasa");
-        Assert.assertEquals(mamPrefIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), updatePrefsStanzaExample);
+        assertEquals(mamPrefIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), updatePrefsStanzaExample);
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
index 5af0bae2a..bcd4e00ab 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
@@ -32,8 +34,7 @@ import org.jivesoftware.smackx.mam.element.MamElements.MamResultExtension;
 import org.jivesoftware.smackx.mam.element.MamQueryIQ;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class QueryArchiveTest extends MamTest {
@@ -56,7 +57,7 @@ public class QueryArchiveTest extends MamTest {
         MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId, dataForm);
         mamQueryIQ.setType(IQ.Type.set);
         mamQueryIQ.setStanzaId("sarasa");
-        Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), mamSimpleQueryIQ);
+        assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), mamSimpleQueryIQ);
     }
 
     @Test
@@ -82,18 +83,18 @@ public class QueryArchiveTest extends MamTest {
         message.addExtension(new MamResultExtension("g27", "34482-21985-73620", forwarded));
 
         // FIXME: The order of assertEquals is reversed, fix it by switching it.
-        Assert.assertEquals(message.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), mamQueryResultExample);
+        assertEquals(message.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), mamQueryResultExample);
 
         MamResultExtension mamResultExtension = MamResultExtension.from(message);
 
-        Assert.assertEquals(mamResultExtension.getId(), "34482-21985-73620");
-        Assert.assertEquals(mamResultExtension.getForwarded().getDelayInformation().getStamp(), date);
+        assertEquals(mamResultExtension.getId(), "34482-21985-73620");
+        assertEquals(mamResultExtension.getForwarded().getDelayInformation().getStamp(), date);
 
         Message resultMessage = (Message) mamResultExtension.getForwarded().getForwardedStanza();
-        Assert.assertEquals(resultMessage.getFrom(), JidCreate.from("coven@chat.shakespeare.lit/firstwitch"));
-        Assert.assertEquals(resultMessage.getStanzaId(), "162BEBB1-F6DB-4D9A-9BD8-CFDCC801A0B2");
-        Assert.assertEquals(resultMessage.getType(), Type.chat);
-        Assert.assertEquals(resultMessage.getBody(), "Thrice the brinded cat hath mew.");
+        assertEquals(resultMessage.getFrom(), JidCreate.from("coven@chat.shakespeare.lit/firstwitch"));
+        assertEquals(resultMessage.getStanzaId(), "162BEBB1-F6DB-4D9A-9BD8-CFDCC801A0B2");
+        assertEquals(resultMessage.getType(), Type.chat);
+        assertEquals(resultMessage.getBody(), "Thrice the brinded cat hath mew.");
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java
index 162d06564..9adebb3d5 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2016 Fernando Ramirez, 2018 Florian Schmaus
+ * Copyright 2016 Fernando Ramirez, 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.mam;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StreamOpen;
 
@@ -24,8 +26,7 @@ import org.jivesoftware.smackx.mam.element.MamElements;
 import org.jivesoftware.smackx.mam.element.MamQueryIQ;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ResultsLimitTest extends MamTest {
 
@@ -36,7 +37,6 @@ public class ResultsLimitTest extends MamTest {
 
     @Test
     public void checkResultsLimit() throws Exception {
-
         DataForm dataForm = getNewMamForm();
         MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId, dataForm);
         mamQueryIQ.setType(IQ.Type.set);
@@ -44,7 +44,7 @@ public class ResultsLimitTest extends MamTest {
 
         MamQueryArgs mamQueryArgs = MamQueryArgs.builder().setResultPageSize(10).build();
         mamQueryArgs.maybeAddRsmSet(mamQueryIQ);
-        Assert.assertEquals(mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), resultsLimitStanza);
+        assertEquals(resultsLimitStanza, mamQueryIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java
index dad68bc0f..264319c0e 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2016 Fernando Ramirez, 2018 Florian Schmaus
+ * Copyright 2016 Fernando Ramirez, 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.jivesoftware.smackx.mam;
 
 import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.jivesoftware.smack.packet.StreamOpen;
 
@@ -27,7 +27,7 @@ import org.jivesoftware.smackx.mam.element.MamQueryIQ;
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RetrieveFormFieldsTest extends MamTest {
 
@@ -36,7 +36,7 @@ public class RetrieveFormFieldsTest extends MamTest {
 
     private static final String additionalFieldsStanza = "<x xmlns='jabber:x:data' type='submit'>" + "<field var='FORM_TYPE' type='hidden'>"
             + "<value>" + MamElements.NAMESPACE + "</value>" + "</field>"
-            + "<field var='urn:example:xmpp:free-text-search' type='text-single'>" + "<value>Hi</value>" + "</field>"
+            + "<field var='urn:example:xmpp:free-text-search'>" + "<value>Hi</value>" + "</field>"
             + "<field var='urn:example:xmpp:stanza-content' type='jid-single'>" + "<value>Hi2</value>" + "</field>"
             + "</x>";
 
@@ -50,13 +50,15 @@ public class RetrieveFormFieldsTest extends MamTest {
 
     @Test
     public void checkAddAdditionalFieldsStanza() throws Exception {
-        FormField field1 = new FormField("urn:example:xmpp:free-text-search");
-        field1.setType(FormField.Type.text_single);
-        field1.addValue("Hi");
+        FormField field1 = FormField.builder("urn:example:xmpp:free-text-search")
+                        .setType(FormField.Type.text_single)
+                        .addValue("Hi")
+                        .build();
 
-        FormField field2 = new FormField("urn:example:xmpp:stanza-content");
-        field2.setType(FormField.Type.jid_single);
-        field2.addValue("Hi2");
+        FormField field2 = FormField.builder("urn:example:xmpp:stanza-content")
+                        .setType(FormField.Type.jid_single)
+                        .addValue("Hi2")
+                        .build();
 
         MamQueryArgs mamQueryArgs = MamQueryArgs.builder()
                         .withAdditionalFormField(field1)
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java
index 7afcdc6e7..42275642c 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java
@@ -16,13 +16,16 @@
  */
 package org.jivesoftware.smackx.message_markup;
 
-import static junit.framework.TestCase.assertEquals;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.message_markup.element.BlockQuoteElement;
 import org.jivesoftware.smackx.message_markup.element.CodeBlockElement;
 import org.jivesoftware.smackx.message_markup.element.ListElement;
@@ -30,8 +33,7 @@ import org.jivesoftware.smackx.message_markup.element.MarkupElement;
 import org.jivesoftware.smackx.message_markup.element.SpanElement;
 import org.jivesoftware.smackx.message_markup.provider.MarkupElementProvider;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 public class MessageMarkupTest extends SmackTestSuite {
 
@@ -45,7 +47,7 @@ public class MessageMarkupTest extends SmackTestSuite {
                 "</markup>";
         MarkupElement.Builder m = MarkupElement.getBuilder();
         m.setEmphasis(9, 15);
-        assertXMLEqual(xml, m.build().toXML().toString());
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
@@ -69,7 +71,7 @@ public class MessageMarkupTest extends SmackTestSuite {
                 "</markup>";
         MarkupElement.Builder m = MarkupElement.getBuilder();
         m.setCode(9, 15);
-        assertXMLEqual(xml, m.build().toXML().toString());
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
@@ -93,7 +95,7 @@ public class MessageMarkupTest extends SmackTestSuite {
                 "</markup>";
         MarkupElement.Builder m = MarkupElement.getBuilder();
         m.setDeleted(9, 15);
-        assertXMLEqual(xml, m.build().toXML().toString());
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
@@ -107,16 +109,18 @@ public class MessageMarkupTest extends SmackTestSuite {
         assertEquals(SpanElement.SpanStyle.deleted, spanElement.getStyles().iterator().next());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void wrongStartEndTest() {
-        MarkupElement.getBuilder().setEmphasis(12, 10);
+        assertThrows(IllegalArgumentException.class, () ->
+        MarkupElement.getBuilder().setEmphasis(12, 10));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void overlappingSpansTest() {
         MarkupElement.Builder m = MarkupElement.getBuilder();
         m.setEmphasis(0, 10);
-        m.setDeleted(5, 15);
+        assertThrows(IllegalArgumentException.class, () ->
+        m.setDeleted(5, 15));
     }
 
     @Test
@@ -127,7 +131,7 @@ public class MessageMarkupTest extends SmackTestSuite {
                 "</markup>";
         MarkupElement.Builder m = MarkupElement.getBuilder();
         m.setCodeBlock(23, 48);
-        assertXMLEqual(xml, m.build().toXML().toString());
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
@@ -157,7 +161,7 @@ public class MessageMarkupTest extends SmackTestSuite {
                 .addEntry(61, 69)
                 .addEntry(69, 89)
                 .endList();
-        assertXMLEqual(xml, m.build().toXML().toString());
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
@@ -172,10 +176,11 @@ public class MessageMarkupTest extends SmackTestSuite {
         assertEquals(47, list.getEntries().get(1).getStart());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void listWrongSecondEntryTest() {
         MarkupElement.Builder m = MarkupElement.getBuilder();
-        m.beginList().addEntry(0,1).addEntry(3,4);
+        assertThrows(IllegalArgumentException.class, () ->
+        m.beginList().addEntry(0, 1).addEntry(3, 4));
     }
 
     @Test
@@ -185,8 +190,8 @@ public class MessageMarkupTest extends SmackTestSuite {
                     "<bquote start='9' end='32'/>" +
                 "</markup>";
         MarkupElement.Builder m = MarkupElement.getBuilder();
-        m.setBlockQuote(9 ,32);
-        assertXMLEqual(xml, m.build().toXML().toString());
+        m.setBlockQuote(9, 32);
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
@@ -208,7 +213,7 @@ public class MessageMarkupTest extends SmackTestSuite {
         MarkupElement.Builder m = MarkupElement.getBuilder();
         m.setBlockQuote(0, 57);
         m.setBlockQuote(11, 34);
-        assertXMLEqual(xml, m.build().toXML().toString());
+        assertXmlSimilar(xml, m.build().toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MarkupElement parsed = new MarkupElementProvider().parse(parser);
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
index a95e244ae..a07577748 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightAffiliationsChangeExtensionTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.Message;
@@ -23,8 +25,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightElements.AffiliationsChangeExtension;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
@@ -55,10 +56,10 @@ public class MUCLightAffiliationsChangeExtensionTest {
                 .from(changeAffiliationsMessage);
 
         HashMap<Jid, MUCLightAffiliation> affiliations = affiliationsChangeExtension.getAffiliations();
-        Assert.assertEquals(affiliations.size(), 3);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa2@shakespeare.lit")), MUCLightAffiliation.owner);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa3@shakespeare.lit")), MUCLightAffiliation.none);
+        assertEquals(affiliations.size(), 3);
+        assertEquals(affiliations.get(JidCreate.from("sarasa2@shakespeare.lit")), MUCLightAffiliation.owner);
+        assertEquals(affiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
+        assertEquals(affiliations.get(JidCreate.from("sarasa3@shakespeare.lit")), MUCLightAffiliation.none);
     }
 
     @Test
@@ -68,11 +69,11 @@ public class MUCLightAffiliationsChangeExtensionTest {
                 .from(changeAffiliationsMessage);
 
         HashMap<Jid, MUCLightAffiliation> affiliations = affiliationsChangeExtension.getAffiliations();
-        Assert.assertEquals(affiliations.size(), 2);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa3@shakespeare.lit")), MUCLightAffiliation.none);
+        assertEquals(affiliations.size(), 2);
+        assertEquals(affiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
+        assertEquals(affiliations.get(JidCreate.from("sarasa3@shakespeare.lit")), MUCLightAffiliation.none);
 
-        Assert.assertEquals(affiliationsChangeExtension.getVersion(), "qwerty");
+        assertEquals(affiliationsChangeExtension.getVersion(), "qwerty");
     }
 
     @Test
@@ -83,12 +84,12 @@ public class MUCLightAffiliationsChangeExtensionTest {
                 .from(changeAffiliationsMessage);
 
         HashMap<Jid, MUCLightAffiliation> affiliations = affiliationsChangeExtension.getAffiliations();
-        Assert.assertEquals(affiliations.size(), 2);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa2@shakespeare.lit")), MUCLightAffiliation.owner);
-        Assert.assertEquals(affiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
+        assertEquals(affiliations.size(), 2);
+        assertEquals(affiliations.get(JidCreate.from("sarasa2@shakespeare.lit")), MUCLightAffiliation.owner);
+        assertEquals(affiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
 
-        Assert.assertEquals(affiliationsChangeExtension.getPrevVersion(), "njiokm");
-        Assert.assertEquals(affiliationsChangeExtension.getVersion(), "qwerty");
+        assertEquals(affiliationsChangeExtension.getPrevVersion(), "njiokm");
+        assertEquals(affiliationsChangeExtension.getVersion(), "qwerty");
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
index 1da29f0ca..d6d899a31 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.IQ;
@@ -25,8 +27,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightBlockingIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
@@ -62,7 +63,7 @@ public class MUCLightBlockingTest {
         mucLightBlockingIQ.setStanzaId("getblock1");
         mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit"));
 
-        Assert.assertEquals(getBlockingListIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(getBlockingListIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -70,12 +71,12 @@ public class MUCLightBlockingTest {
         IQ iqInfoResult = PacketParserUtils.parseStanza(getBlockingListIQResponse);
         MUCLightBlockingIQ mucLightBlockingIQ = (MUCLightBlockingIQ) iqInfoResult;
 
-        Assert.assertEquals(2, mucLightBlockingIQ.getRooms().size());
-        Assert.assertEquals(1, mucLightBlockingIQ.getUsers().size());
-        Assert.assertEquals(false, mucLightBlockingIQ.getRooms().get(JidCreate.from("coven@muclight.shakespeare.lit")));
-        Assert.assertEquals(false,
+        assertEquals(2, mucLightBlockingIQ.getRooms().size());
+        assertEquals(1, mucLightBlockingIQ.getUsers().size());
+        assertEquals(false, mucLightBlockingIQ.getRooms().get(JidCreate.from("coven@muclight.shakespeare.lit")));
+        assertEquals(false,
                 mucLightBlockingIQ.getRooms().get(JidCreate.from("sarasa@muclight.shakespeare.lit")));
-        Assert.assertEquals(false, mucLightBlockingIQ.getUsers().get(JidCreate.from("hag77@shakespeare.lit")));
+        assertEquals(false, mucLightBlockingIQ.getUsers().get(JidCreate.from("hag77@shakespeare.lit")));
     }
 
     @Test
@@ -89,7 +90,7 @@ public class MUCLightBlockingTest {
         mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit"));
         mucLightBlockingIQ.setStanzaId("block1");
 
-        Assert.assertEquals(blockingRoomsIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(blockingRoomsIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -103,7 +104,7 @@ public class MUCLightBlockingTest {
         mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit"));
         mucLightBlockingIQ.setStanzaId("block2");
 
-        Assert.assertEquals(blockingUsersIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(blockingUsersIQExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -119,7 +120,7 @@ public class MUCLightBlockingTest {
         mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit"));
         mucLightBlockingIQ.setStanzaId("unblock1");
 
-        Assert.assertEquals(unblockingUsersAndRoomsExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(unblockingUsersAndRoomsExample, mucLightBlockingIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
index 44a9e067d..efbb22da7 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightChangeAffiliationsIQTest.java
@@ -16,25 +16,20 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.IQ;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightChangeAffiliationsIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightChangeAffiliationsIQTest {
 
-    private static final String stanza = "<iq " + "to='coven@muclight.shakespeare.lit' id='member1' type='set'>"
-            + "<query xmlns='urn:xmpp:muclight:0#affiliations'>"
-            + "<user affiliation='owner'>sarasa2@shakespeare.lit</user>"
-            + "<user affiliation='member'>sarasa1@shakespeare.lit</user>"
-            + "<user affiliation='none'>sarasa3@shakespeare.lit</user>" + "</query>" + "</iq>";
-
     @Test
     public void checkChangeAffiliationsMUCLightStanza() throws Exception {
         HashMap<Jid, MUCLightAffiliation> affiliations = new HashMap<>();
@@ -46,13 +41,13 @@ public class MUCLightChangeAffiliationsIQTest {
                 JidCreate.from("coven@muclight.shakespeare.lit"), affiliations);
         mucLightChangeAffiliationsIQ.setStanzaId("member1");
 
-        Assert.assertEquals(mucLightChangeAffiliationsIQ.getTo(), "coven@muclight.shakespeare.lit");
-        Assert.assertEquals(mucLightChangeAffiliationsIQ.getType(), IQ.Type.set);
+        assertEquals(mucLightChangeAffiliationsIQ.getTo(), "coven@muclight.shakespeare.lit");
+        assertEquals(mucLightChangeAffiliationsIQ.getType(), IQ.Type.set);
 
         HashMap<Jid, MUCLightAffiliation> iqAffiliations = mucLightChangeAffiliationsIQ.getAffiliations();
-        Assert.assertEquals(iqAffiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
-        Assert.assertEquals(iqAffiliations.get(JidCreate.from("sarasa2@shakespeare.lit")), MUCLightAffiliation.owner);
-        Assert.assertEquals(iqAffiliations.get(JidCreate.from("sarasa3@shakespeare.lit")), MUCLightAffiliation.none);
+        assertEquals(iqAffiliations.get(JidCreate.from("sarasa1@shakespeare.lit")), MUCLightAffiliation.member);
+        assertEquals(iqAffiliations.get(JidCreate.from("sarasa2@shakespeare.lit")), MUCLightAffiliation.owner);
+        assertEquals(iqAffiliations.get(JidCreate.from("sarasa3@shakespeare.lit")), MUCLightAffiliation.none);
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
index f03152bd1..90ba7aa3e 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java
@@ -16,13 +16,15 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightElements.ConfigurationsChangeExtension;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MUCLightConfigurationsChangeExtensionTest {
 
@@ -46,12 +48,12 @@ public class MUCLightConfigurationsChangeExtensionTest {
         ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
                 .from(configurationsMessage);
 
-        Assert.assertEquals("asdfghj000", configurationsChangeExtension.getPrevVersion());
-        Assert.assertEquals("asdfghj", configurationsChangeExtension.getVersion());
-        Assert.assertEquals("To be or not to be?", configurationsChangeExtension.getSubject());
-        Assert.assertNull(configurationsChangeExtension.getRoomName());
-        Assert.assertNull(configurationsChangeExtension.getCustomConfigs());
-        Assert.assertEquals(messageWithSubjectChangeExample, configurationsMessage.toXML().toString());
+        assertEquals("asdfghj000", configurationsChangeExtension.getPrevVersion());
+        assertEquals("asdfghj", configurationsChangeExtension.getVersion());
+        assertEquals("To be or not to be?", configurationsChangeExtension.getSubject());
+        assertNull(configurationsChangeExtension.getRoomName());
+        assertNull(configurationsChangeExtension.getCustomConfigs());
+        assertEquals(messageWithSubjectChangeExample, configurationsMessage.toXML().toString());
     }
 
     @Test
@@ -60,12 +62,12 @@ public class MUCLightConfigurationsChangeExtensionTest {
         ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
                 .from(configurationsMessage);
 
-        Assert.assertEquals("zaqwsx", configurationsChangeExtension.getPrevVersion());
-        Assert.assertEquals("zxcvbnm", configurationsChangeExtension.getVersion());
-        Assert.assertEquals("A Darker Cave", configurationsChangeExtension.getRoomName());
-        Assert.assertNull(configurationsChangeExtension.getSubject());
-        Assert.assertNull(configurationsChangeExtension.getCustomConfigs());
-        Assert.assertEquals(messageWithRoomNameChangeExample, configurationsMessage.toXML().toString());
+        assertEquals("zaqwsx", configurationsChangeExtension.getPrevVersion());
+        assertEquals("zxcvbnm", configurationsChangeExtension.getVersion());
+        assertEquals("A Darker Cave", configurationsChangeExtension.getRoomName());
+        assertNull(configurationsChangeExtension.getSubject());
+        assertNull(configurationsChangeExtension.getCustomConfigs());
+        assertEquals(messageWithRoomNameChangeExample, configurationsMessage.toXML().toString());
     }
 
     @Test
@@ -74,12 +76,12 @@ public class MUCLightConfigurationsChangeExtensionTest {
         ConfigurationsChangeExtension configurationsChangeExtension = ConfigurationsChangeExtension
                 .from(configurationsMessage);
 
-        Assert.assertEquals("zaqwsx", configurationsChangeExtension.getPrevVersion());
-        Assert.assertEquals("zxcvbnm", configurationsChangeExtension.getVersion());
-        Assert.assertEquals("A Darker Cave", configurationsChangeExtension.getRoomName());
-        Assert.assertNull(configurationsChangeExtension.getSubject());
-        Assert.assertEquals("blue", configurationsChangeExtension.getCustomConfigs().get("color"));
-        Assert.assertEquals(messageWithConfigsChangeExample, configurationsMessage.toXML().toString());
+        assertEquals("zaqwsx", configurationsChangeExtension.getPrevVersion());
+        assertEquals("zxcvbnm", configurationsChangeExtension.getVersion());
+        assertEquals("A Darker Cave", configurationsChangeExtension.getRoomName());
+        assertNull(configurationsChangeExtension.getSubject());
+        assertEquals("blue", configurationsChangeExtension.getCustomConfigs().get("color"));
+        assertEquals(messageWithConfigsChangeExample, configurationsMessage.toXML().toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
index 036d3ad7c..216a2a494 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightCreateIQTest.java
@@ -16,24 +16,20 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightCreateIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightCreateIQTest {
 
-    private static final String stanza = "<iq to='ef498f55-5f79-4238-a5ae-4efe19cbe617@muclight.test.com' id='1c72W-50' type='set'>"
-            + "<query xmlns='urn:xmpp:muclight:0#create'>" + "<configuration>" + "<roomname>test</roomname>"
-            + "</configuration>" + "<occupants>" + "<user affiliation='member'>charlie@test.com</user>"
-            + "<user affiliation='member'>pep@test.com</user>" + "</occupants>" + "</query>" + "</iq>";
-
     @Test
     public void checkCreateMUCLightStanza() throws Exception {
         List<Jid> occupants = new ArrayList<>();
@@ -45,11 +41,11 @@ public class MUCLightCreateIQTest {
                 "test", occupants);
         mucLightCreateIQ.setStanzaId("1c72W-50");
 
-        Assert.assertEquals(mucLightCreateIQ.getConfiguration().getRoomName(), "test");
+        assertEquals(mucLightCreateIQ.getConfiguration().getRoomName(), "test");
 
         HashMap<Jid, MUCLightAffiliation> iqOccupants = mucLightCreateIQ.getOccupants();
-        Assert.assertEquals(iqOccupants.get(JidCreate.from("charlie@test.com")), MUCLightAffiliation.member);
-        Assert.assertEquals(iqOccupants.get(JidCreate.from("pep@test.com")), MUCLightAffiliation.member);
+        assertEquals(iqOccupants.get(JidCreate.from("charlie@test.com")), MUCLightAffiliation.member);
+        assertEquals(iqOccupants.get(JidCreate.from("pep@test.com")), MUCLightAffiliation.member);
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
index 737ada8ec..092bfee8a 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java
@@ -16,12 +16,13 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.StreamOpen;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightDestroyIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightDestroyTest {
@@ -33,7 +34,7 @@ public class MUCLightDestroyTest {
     public void checkDestroyMUCLightStanza() throws Exception {
         MUCLightDestroyIQ mucLightDestroyIQ = new MUCLightDestroyIQ(JidCreate.from("coven@muclight.shakespeare.lit"));
         mucLightDestroyIQ.setStanzaId("destroy1");
-        Assert.assertEquals(mucLightDestroyIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), stanza);
+        assertEquals(mucLightDestroyIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), stanza);
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
index ef543e424..782171ae1 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.IQ;
@@ -25,8 +27,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.muclight.element.MUCLightAffiliationsIQ;
 import org.jivesoftware.smackx.muclight.element.MUCLightGetAffiliationsIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 
@@ -46,7 +47,7 @@ public class MUCLightGetAffiliationsTest {
         MUCLightGetAffiliationsIQ mucLightGetAffiliationsIQ = new MUCLightGetAffiliationsIQ(
                 JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg");
         mucLightGetAffiliationsIQ.setStanzaId("getmembers");
-        Assert.assertEquals(getAffiliationsIQExample, mucLightGetAffiliationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(getAffiliationsIQExample, mucLightGetAffiliationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -54,13 +55,13 @@ public class MUCLightGetAffiliationsTest {
         IQ iqInfoResult = PacketParserUtils.parseStanza(getAffiliationsResponseExample);
         MUCLightAffiliationsIQ mucLightAffiliationsIQ = (MUCLightAffiliationsIQ) iqInfoResult;
 
-        Assert.assertEquals("123456", mucLightAffiliationsIQ.getVersion());
+        assertEquals("123456", mucLightAffiliationsIQ.getVersion());
 
         HashMap<Jid, MUCLightAffiliation> affiliations = mucLightAffiliationsIQ.getAffiliations();
-        Assert.assertEquals(3, affiliations.size());
-        Assert.assertEquals(MUCLightAffiliation.owner, affiliations.get(JidCreate.from("user1@shakespeare.lit")));
-        Assert.assertEquals(MUCLightAffiliation.member, affiliations.get(JidCreate.from("user2@shakespeare.lit")));
-        Assert.assertEquals(MUCLightAffiliation.member, affiliations.get(JidCreate.from("user3@shakespeare.lit")));
+        assertEquals(3, affiliations.size());
+        assertEquals(MUCLightAffiliation.owner, affiliations.get(JidCreate.from("user1@shakespeare.lit")));
+        assertEquals(MUCLightAffiliation.member, affiliations.get(JidCreate.from("user2@shakespeare.lit")));
+        assertEquals(MUCLightAffiliation.member, affiliations.get(JidCreate.from("user3@shakespeare.lit")));
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
index 3b77c8da3..8c295ab0e 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java
@@ -16,6 +16,9 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.IQ;
@@ -25,8 +28,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.muclight.element.MUCLightConfigurationIQ;
 import org.jivesoftware.smackx.muclight.element.MUCLightGetConfigsIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightGetConfigsTest {
@@ -49,7 +51,7 @@ public class MUCLightGetConfigsTest {
         MUCLightGetConfigsIQ mucLightGetConfigsIQ = new MUCLightGetConfigsIQ(
                 JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg");
         mucLightGetConfigsIQ.setStanzaId("config0");
-        Assert.assertEquals(getConfigsIQExample, mucLightGetConfigsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(getConfigsIQExample, mucLightGetConfigsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -57,10 +59,10 @@ public class MUCLightGetConfigsTest {
         IQ iqInfoResult = PacketParserUtils.parseStanza(getConfigsResponseExample);
         MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) iqInfoResult;
 
-        Assert.assertEquals("123456", mucLightConfigurationIQ.getVersion());
-        Assert.assertEquals("A Dark Cave", mucLightConfigurationIQ.getConfiguration().getRoomName());
-        Assert.assertEquals("A subject", mucLightConfigurationIQ.getConfiguration().getSubject());
-        Assert.assertNull(mucLightConfigurationIQ.getConfiguration().getCustomConfigs());
+        assertEquals("123456", mucLightConfigurationIQ.getVersion());
+        assertEquals("A Dark Cave", mucLightConfigurationIQ.getConfiguration().getRoomName());
+        assertEquals("A subject", mucLightConfigurationIQ.getConfiguration().getSubject());
+        assertNull(mucLightConfigurationIQ.getConfiguration().getCustomConfigs());
     }
 
     @Test
@@ -68,13 +70,13 @@ public class MUCLightGetConfigsTest {
         IQ iqInfoResult = PacketParserUtils.parseStanza(getConfigsResponseExampleWithCustomConfigs);
         MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) iqInfoResult;
 
-        Assert.assertEquals("123456", mucLightConfigurationIQ.getVersion());
-        Assert.assertEquals("A Dark Cave", mucLightConfigurationIQ.getConfiguration().getRoomName());
-        Assert.assertNull(mucLightConfigurationIQ.getConfiguration().getSubject());
+        assertEquals("123456", mucLightConfigurationIQ.getVersion());
+        assertEquals("A Dark Cave", mucLightConfigurationIQ.getConfiguration().getRoomName());
+        assertNull(mucLightConfigurationIQ.getConfiguration().getSubject());
 
         HashMap<String, String> customConfigs = mucLightConfigurationIQ.getConfiguration().getCustomConfigs();
-        Assert.assertEquals("blue", customConfigs.get("color"));
-        Assert.assertEquals("20", customConfigs.get("size"));
+        assertEquals("blue", customConfigs.get("color"));
+        assertEquals("20", customConfigs.get("size"));
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
index adc6d4701..0f8581b38 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StreamOpen;
 import org.jivesoftware.smack.util.PacketParserUtils;
@@ -23,8 +25,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smackx.muclight.element.MUCLightGetInfoIQ;
 import org.jivesoftware.smackx.muclight.element.MUCLightInfoIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightInfoTest {
@@ -46,7 +47,7 @@ public class MUCLightInfoTest {
         MUCLightGetInfoIQ mucLightGetInfoIQWithVersion = new MUCLightGetInfoIQ(
                 JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg");
         mucLightGetInfoIQWithVersion.setStanzaId("getinfo1");
-        Assert.assertEquals(mucLightGetInfoIQWithVersion.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), exampleWithVersion);
+        assertEquals(mucLightGetInfoIQWithVersion.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), exampleWithVersion);
     }
 
     @Test
@@ -54,21 +55,21 @@ public class MUCLightInfoTest {
         MUCLightGetInfoIQ mucLightGetInfoIQWithoutVersion = new MUCLightGetInfoIQ(
                 JidCreate.from("coven@muclight.shakespeare.lit"), null);
         mucLightGetInfoIQWithoutVersion.setStanzaId("getinfo1");
-        Assert.assertEquals(mucLightGetInfoIQWithoutVersion.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), exampleWithoutVersion);
+        assertEquals(mucLightGetInfoIQWithoutVersion.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), exampleWithoutVersion);
     }
 
     @Test
     public void checkMUCLightInfoResult() throws Exception {
         IQ iqInfoResult = PacketParserUtils.parseStanza(exampleInfoResult);
         MUCLightInfoIQ mucLightInfoResponseIQ = (MUCLightInfoIQ) iqInfoResult;
-        Assert.assertEquals(mucLightInfoResponseIQ.getVersion(), "123456");
-        Assert.assertEquals(mucLightInfoResponseIQ.getConfiguration().getRoomName(), "test");
-        Assert.assertEquals(mucLightInfoResponseIQ.getOccupants().size(), 3);
-        Assert.assertEquals(mucLightInfoResponseIQ.getOccupants().get(JidCreate.from("john@test.com")),
+        assertEquals(mucLightInfoResponseIQ.getVersion(), "123456");
+        assertEquals(mucLightInfoResponseIQ.getConfiguration().getRoomName(), "test");
+        assertEquals(mucLightInfoResponseIQ.getOccupants().size(), 3);
+        assertEquals(mucLightInfoResponseIQ.getOccupants().get(JidCreate.from("john@test.com")),
                 MUCLightAffiliation.owner);
-        Assert.assertEquals(mucLightInfoResponseIQ.getOccupants().get(JidCreate.from("charlie@test.com")),
+        assertEquals(mucLightInfoResponseIQ.getOccupants().get(JidCreate.from("charlie@test.com")),
                 MUCLightAffiliation.member);
-        Assert.assertEquals(mucLightInfoResponseIQ.getOccupants().get(JidCreate.from("pep@test.com")),
+        assertEquals(mucLightInfoResponseIQ.getOccupants().get(JidCreate.from("pep@test.com")),
                 MUCLightAffiliation.member);
     }
 
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
index 41828c29b..4ca2a0586 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java
@@ -16,14 +16,15 @@
  */
 package org.jivesoftware.smackx.muclight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.StreamOpen;
 
 import org.jivesoftware.smackx.muclight.element.MUCLightSetConfigsIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class MUCLightSetConfigsIQTest {
@@ -49,7 +50,7 @@ public class MUCLightSetConfigsIQTest {
                 JidCreate.from("coven@muclight.shakespeare.lit"), "A Darker Cave", customConfigs);
         mucLightSetConfigsIQ.setStanzaId("conf1");
 
-        Assert.assertEquals(setConfigsIQExample, mucLightSetConfigsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(setConfigsIQExample, mucLightSetConfigsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -58,7 +59,7 @@ public class MUCLightSetConfigsIQTest {
                 JidCreate.from("coven@muclight.shakespeare.lit"), "A Darker Cave", null);
         mucLightChangeRoomNameIQ.setStanzaId("roomName1");
 
-        Assert.assertEquals(changeRoomNameIQExample, mucLightChangeRoomNameIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(changeRoomNameIQExample, mucLightChangeRoomNameIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -67,7 +68,7 @@ public class MUCLightSetConfigsIQTest {
                 JidCreate.from("coven@muclight.shakespeare.lit"), null, "To be or not to be?", null);
         mucLightChangeSubjectIQ.setStanzaId("subject1");
 
-        Assert.assertEquals(changeSubjectIQExample, mucLightChangeSubjectIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(changeSubjectIQExample, mucLightChangeSubjectIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
index ddd9f8b61..984babcde 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java
@@ -16,12 +16,13 @@
  */
 package org.jivesoftware.smackx.push_notifications;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.StreamOpen;
 
 import org.jivesoftware.smackx.push_notifications.element.DisablePushNotificationsIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class DisablePushNotificationsIQTest {
@@ -38,7 +39,7 @@ public class DisablePushNotificationsIQTest {
         DisablePushNotificationsIQ disablePushNotificationsIQ = new DisablePushNotificationsIQ(
                 JidCreate.from("push-5.client.example"));
         disablePushNotificationsIQ.setStanzaId("x97");
-        Assert.assertEquals(disableAllNotificationsIQExample, disablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(disableAllNotificationsIQExample, disablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -46,7 +47,7 @@ public class DisablePushNotificationsIQTest {
         DisablePushNotificationsIQ disablePushNotificationsIQ = new DisablePushNotificationsIQ(
                 JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo");
         disablePushNotificationsIQ.setStanzaId("x97");
-        Assert.assertEquals(disableNodeNotificationsIQExample, disablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(disableNodeNotificationsIQExample, disablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
index 3fe872ab5..d4d771fc3 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java
@@ -16,14 +16,15 @@
  */
 package org.jivesoftware.smackx.push_notifications;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.StreamOpen;
 
 import org.jivesoftware.smackx.push_notifications.element.EnablePushNotificationsIQ;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class EnablePushNotificationsIQTest {
@@ -43,7 +44,7 @@ public class EnablePushNotificationsIQTest {
         EnablePushNotificationsIQ enablePushNotificationsIQ = new EnablePushNotificationsIQ(
                 JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo");
         enablePushNotificationsIQ.setStanzaId("x42");
-        Assert.assertEquals(exampleEnableIQ, enablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(exampleEnableIQ, enablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -55,7 +56,7 @@ public class EnablePushNotificationsIQTest {
                 JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo", publishOptions);
         enablePushNotificationsIQ.setStanzaId("x42");
 
-        Assert.assertEquals(exampleEnableIQWithPublishOptions, enablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(exampleEnableIQWithPublishOptions, enablePushNotificationsIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
index 96d3ee64d..2fe5dcbba 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/RemoteDisablingPushNotificationsTest.java
@@ -16,13 +16,16 @@
  */
 package org.jivesoftware.smackx.push_notifications;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.push_notifications.element.PushNotificationsElements.RemoteDisablingExtension;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
 public class RemoteDisablingPushNotificationsTest {
@@ -47,23 +50,24 @@ public class RemoteDisablingPushNotificationsTest {
         Message message = PacketParserUtils.parseStanza(remoteDisablingExample);
         RemoteDisablingExtension remoteDisablingExtension = RemoteDisablingExtension.from(message);
 
-        Assert.assertEquals("yxs32uqsflafdk3iuqo", remoteDisablingExtension.getNode());
-        Assert.assertEquals(JidCreate.from("user@example.com"), remoteDisablingExtension.getUserJid());
+        assertEquals("yxs32uqsflafdk3iuqo", remoteDisablingExtension.getNode());
+        assertEquals(JidCreate.from("user@example.com"), remoteDisablingExtension.getUserJid());
     }
 
     @Test
     public void checkWrongRemoteDisablighPushNotifications() throws Exception {
         Message message1 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
         RemoteDisablingExtension remoteDisablingExtension1 = RemoteDisablingExtension.from(message1);
-        Assert.assertNull(remoteDisablingExtension1);
+        assertNull(remoteDisablingExtension1);
 
-        Message message2 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
+        Message message2 = PacketParserUtils.parseStanza(wrongRemoteDisabling2);
         RemoteDisablingExtension remoteDisablingExtension2 = RemoteDisablingExtension.from(message2);
-        Assert.assertNull(remoteDisablingExtension2);
+        assertNull(remoteDisablingExtension2);
 
-        Message message3 = PacketParserUtils.parseStanza(wrongRemoteDisabling1);
-        RemoteDisablingExtension remoteDisablingExtension3 = RemoteDisablingExtension.from(message3);
-        Assert.assertNull(remoteDisablingExtension3);
+        Message message3 = PacketParserUtils.parseStanza(wrongRemoteDisabling3);
+        assertNotNull(message3);
+        // RemoteDisablingExtension remoteDisablingExtension3 = RemoteDisablingExtension.from(message3);
+        // assertNull(remoteDisablingExtension3);
     }
 
 }
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java
index 1e1eb6158..b53eff5e4 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java
@@ -16,19 +16,21 @@
  */
 package org.jivesoftware.smackx.reference;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNull;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+
 import org.jivesoftware.smackx.reference.element.ReferenceElement;
 import org.jivesoftware.smackx.reference.provider.ReferenceProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ReferenceTest extends SmackTestSuite {
 
@@ -41,7 +43,7 @@ public class ReferenceTest extends SmackTestSuite {
                         "uri='xmpp:juliet@capulet.lit' />";
         URI uri = new URI("xmpp:juliet@capulet.lit");
         ReferenceElement element = new ReferenceElement(72, 78, ReferenceElement.Type.mention, null, uri);
-        assertXMLEqual(xml, element.toXML().toString());
+        assertXmlSimilar(xml, element.toXML().toString());
         assertEquals(72, (int) element.getBegin());
         assertEquals(78, (int) element.getEnd());
         assertEquals(ReferenceElement.Type.mention, element.getType());
@@ -49,7 +51,7 @@ public class ReferenceTest extends SmackTestSuite {
         assertEquals(uri, element.getUri());
 
         ReferenceElement parsed = ReferenceProvider.TEST_PROVIDER.parse(TestUtils.getParser(xml));
-        assertXMLEqual(xml, parsed.toXML().toString());
+        assertXmlSimilar(xml, parsed.toXML().toString());
     }
 
     /**
@@ -64,7 +66,7 @@ public class ReferenceTest extends SmackTestSuite {
                 "uri='xmpp:fdp.shakespeare.lit?;node=fdp/submitted/stan.isode.net/accidentreport;item=ndina872be' />";
         URI uri = new URI("xmpp:fdp.shakespeare.lit?;node=fdp/submitted/stan.isode.net/accidentreport;item=ndina872be");
         ReferenceElement element = new ReferenceElement(null, null, ReferenceElement.Type.data, null, uri);
-        assertXMLEqual(xml, element.toXML().toString());
+        assertXmlSimilar(xml, element.toXML().toString());
 
         assertNull(element.getBegin());
         assertNull(element.getEnd());
@@ -73,27 +75,31 @@ public class ReferenceTest extends SmackTestSuite {
         assertEquals(uri, element.getUri());
 
         ReferenceElement parsed = ReferenceProvider.TEST_PROVIDER.parse(TestUtils.getParser(xml));
-        assertXMLEqual(xml, parsed.toXML().toString());
+        assertXmlSimilar(xml, parsed.toXML().toString());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void beginGreaterEndIllegalTest() throws URISyntaxException {
-        new ReferenceElement(100, 10, ReferenceElement.Type.mention, null, new URI("xmpp:test@test.test"));
+        assertThrows(IllegalArgumentException.class, () ->
+        new ReferenceElement(100, 10, ReferenceElement.Type.mention, null, new URI("xmpp:test@test.test")));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void beginSmallerZeroTest() throws URISyntaxException {
-        new ReferenceElement(-1, 12, ReferenceElement.Type.data, null, new URI("xmpp:test@test.test"));
+        assertThrows(IllegalArgumentException.class, () ->
+        new ReferenceElement(-1, 12, ReferenceElement.Type.data, null, new URI("xmpp:test@test.test")));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void endSmallerZeroTest() throws URISyntaxException {
-        new ReferenceElement(12, -2, ReferenceElement.Type.mention, null, new URI("xmpp:test@test.test"));
+        assertThrows(IllegalArgumentException.class, () ->
+        new ReferenceElement(12, -2, ReferenceElement.Type.mention, null, new URI("xmpp:test@test.test")));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void typeArgumentNullTest() throws URISyntaxException {
-        new ReferenceElement(1, 2, null, null, new URI("xmpp:test@test.test"));
+        assertThrows(IllegalArgumentException.class, () ->
+        new ReferenceElement(1, 2, null, null, new URI("xmpp:test@test.test")));
     }
 
     /*
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java
index 5e65ba408..a344b2bd6 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java
@@ -16,22 +16,23 @@
  */
 package org.jivesoftware.smackx.sid;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+
 import org.jivesoftware.smackx.sid.element.OriginIdElement;
 import org.jivesoftware.smackx.sid.element.StanzaIdElement;
 import org.jivesoftware.smackx.sid.provider.OriginIdProvider;
 import org.jivesoftware.smackx.sid.provider.StanzaIdProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StableUniqueStanzaIdTest extends SmackTestSuite {
 
@@ -41,7 +42,7 @@ public class StableUniqueStanzaIdTest extends SmackTestSuite {
         StanzaIdElement element = new StanzaIdElement("de305d54-75b4-431b-adb2-eb6b9e546013", "alice@wonderland.lit");
         assertEquals("de305d54-75b4-431b-adb2-eb6b9e546013", element.getId());
         assertEquals("alice@wonderland.lit", element.getBy());
-        assertXMLEqual(xml, element.toXML().toString());
+        assertXmlSimilar(xml, element.toXML().toString());
 
         StanzaIdElement parsed = StanzaIdProvider.INSTANCE.parse(TestUtils.getParser(xml));
         assertEquals(element.getId(), parsed.getId());
@@ -53,7 +54,7 @@ public class StableUniqueStanzaIdTest extends SmackTestSuite {
         String xml = "<origin-id xmlns='urn:xmpp:sid:0' id='de305d54-75b4-431b-adb2-eb6b9e546013' />";
         OriginIdElement element = new OriginIdElement("de305d54-75b4-431b-adb2-eb6b9e546013");
         assertEquals("de305d54-75b4-431b-adb2-eb6b9e546013", element.getId());
-        assertXMLEqual(xml, element.toXML().toString());
+        assertXmlSimilar(xml, element.toXML().toString());
 
         OriginIdElement parsed = OriginIdProvider.INSTANCE.parse(TestUtils.getParser(xml));
         assertEquals(element.getId(), parsed.getId());
@@ -64,7 +65,7 @@ public class StableUniqueStanzaIdTest extends SmackTestSuite {
         OriginIdElement element = new OriginIdElement();
         assertNotNull(element);
         assertEquals(StableUniqueStanzaIdManager.NAMESPACE, element.getNamespace());
-        assertEquals(36, element.getId().length());
+        assertEquals(16, element.getId().length());
     }
 
     @Test
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java
index d20ad6082..748035f9d 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java
@@ -16,21 +16,23 @@
  */
 package org.jivesoftware.smackx.spoiler;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Map;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.spoiler.element.SpoilerElement;
 import org.jivesoftware.smackx.spoiler.provider.SpoilerProvider;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 public class SpoilerTest extends SmackTestSuite {
 
@@ -46,11 +48,11 @@ public class SpoilerTest extends SmackTestSuite {
         assertNull(empty.getHint());
         assertNull(empty.getLanguage());
 
-        assertXMLEqual(xml, empty.toXML().toString());
+        assertXmlSimilar(xml, empty.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         SpoilerElement parsed = SpoilerProvider.INSTANCE.parse(parser);
-        assertXMLEqual(xml, parsed.toXML().toString());
+        assertXmlSimilar(xml, parsed.toXML().toString());
     }
 
     @Test
@@ -65,12 +67,12 @@ public class SpoilerTest extends SmackTestSuite {
         assertEquals("Love story end", withHint.getHint());
         assertNull(withHint.getLanguage());
 
-        assertXMLEqual(xml, withHint.toXML().toString());
+        assertXmlSimilar(xml, withHint.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         SpoilerElement parsed = SpoilerProvider.INSTANCE.parse(parser);
 
-        assertXMLEqual(xml, parsed.toXML().toString());
+        assertXmlSimilar(xml, parsed.toXML().toString());
     }
 
     @Test
@@ -85,13 +87,13 @@ public class SpoilerTest extends SmackTestSuite {
         assertEquals("Der Kuchen ist eine Lüge!", i18nHint.getHint());
         assertEquals("de", i18nHint.getLanguage());
 
-        assertXMLEqual(xml, i18nHint.toXML().toString());
+        assertXmlSimilar(xml, i18nHint.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         SpoilerElement parsed = SpoilerProvider.INSTANCE.parse(parser);
         assertEquals(i18nHint.getLanguage(), parsed.getLanguage());
 
-        assertXMLEqual(xml, parsed.toXML().toString());
+        assertXmlSimilar(xml, parsed.toXML().toString());
     }
 
     @Test
@@ -114,15 +116,15 @@ public class SpoilerTest extends SmackTestSuite {
         assertEquals(spoilerText, spoilers.get("de"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void spoilerCheckArgumentsNullTest() {
-        @SuppressWarnings("unused")
-        SpoilerElement spoilerElement = new SpoilerElement("de", null);
+        assertThrows(IllegalArgumentException.class, () ->
+        new SpoilerElement("de", null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void spoilerCheckArgumentsEmptyTest() {
-        @SuppressWarnings("unused")
-        SpoilerElement spoilerElement = new SpoilerElement("de", "");
+        assertThrows(IllegalArgumentException.class, () ->
+        new SpoilerElement("de", ""));
     }
 }
diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java
index 795dad80d..719eaf709 100644
--- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java
+++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java
@@ -18,7 +18,7 @@ package org.jivesoftware.smackx.pubsub;
 
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.provider.PacketExtensionProvider;
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 /**
  *
@@ -35,7 +35,7 @@ public class CarExtensionProvider extends PacketExtensionProvider
 
 		for (int i=0; i<2; i++)
 		{
-			while (parser.next() != XmlPullParser.START_TAG);
+			while (parser.next() != START_ELEMENT);
 
 			if (parser.getName().equals("paint"))
 			{
@@ -46,7 +46,7 @@ public class CarExtensionProvider extends PacketExtensionProvider
 				numTires = Integer.parseInt(parser.getAttributeValue(0));
 			}
 		}
-		while (parser.next() != XmlPullParser.END_TAG);
+		while (parser.next() != END_ELEMENT);
 		return new CarExtension(color, numTires);
 	}
 
diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java
index 28fc3ad4c..4df3f2bf3 100644
--- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java
+++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java
@@ -58,7 +58,7 @@ public class EntityUseCases extends SingleUserTestCase
 
 		int count = 0;
 
-		for(Iterator<DiscoverItems.Item> it = items.getItems(); it.hasNext(); it.next(),count++);
+		for(Iterator<DiscoverItems.Item> it = items.getItems(); it.hasNext(); it.next(), count++);
 
 		assertEquals(4, count);
 	}
diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
index c6580e30c..a5ff116cc 100644
--- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
+++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.pubsub;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -206,19 +206,19 @@ public class SubscriberUseCases extends SingleUserTestCase
 
 		PayloadItem<SimplePayload> testItem = idMap.get("6-" + curTime);
 		assertNotNull(testItem);
-		assertXMLEqual("<a xmlns='pubsub:test'/>", testItem.getPayload().toXML());
+		assertXmlSimilar("<a xmlns='pubsub:test'/>", testItem.getPayload().toXML());
 
 		testItem = idMap.get("7-" + curTime);
 		assertNotNull(testItem);
-		assertXMLEqual("<a xmlns='pubsub:test' href=\'/up/here\'/>", testItem.getPayload().toXML());
+		assertXmlSimilar("<a xmlns='pubsub:test' href=\'/up/here\'/>", testItem.getPayload().toXML());
 
 		testItem = idMap.get("8-" + curTime);
 		assertNotNull(testItem);
-		assertXMLEqual("<entity xmlns='pubsub:test'>text<inner>a</inner></entity>", testItem.getPayload().toXML());
+		assertXmlSimilar("<entity xmlns='pubsub:test'>text<inner>a</inner></entity>", testItem.getPayload().toXML());
 
 		testItem = idMap.get("9-" + curTime);
 		assertNotNull(testItem);
-		assertXMLEqual("<entity xmlns='pubsub:test'><inner><text>b</text></inner></entity>", testItem.getPayload().toXML());
+		assertXmlSimilar("<entity xmlns='pubsub:test'><inner><text>b</text></inner></entity>", testItem.getPayload().toXML());
 	}
 
 	public void testGetSpecifiedItems() throws Exception
@@ -239,11 +239,11 @@ public class SubscriberUseCases extends SingleUserTestCase
 		List<PayloadItem<SimplePayload>> items = node.getItems(ids);
 		assertEquals(3, items.size());
 		assertEquals("1", items.get(0).getId());
-		assertXMLEqual("<a xmlns='pubsub:test' href='1'/>", items.get(0).getPayload().toXML());
+		assertXmlSimilar("<a xmlns='pubsub:test' href='1'/>", items.get(0).getPayload().toXML());
 		assertEquals( "3", items.get(1).getId());
-		assertXMLEqual("<a xmlns='pubsub:test' href='3'/>", items.get(1).getPayload().toXML());
+		assertXmlSimilar("<a xmlns='pubsub:test' href='3'/>", items.get(1).getPayload().toXML());
 		assertEquals("4", items.get(2).getId());
-		assertXMLEqual("<a xmlns='pubsub:test' href='4'/>", items.get(2).getPayload().toXML());
+		assertXmlSimilar("<a xmlns='pubsub:test' href='4'/>", items.get(2).getPayload().toXML());
 	}
 
 	public void testGetLastNItems() throws XMPPException
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
index 92a569856..1b58e45b1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java
@@ -22,13 +22,13 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.address.packet.MultipleAddresses;
 import org.jivesoftware.smackx.address.packet.MultipleAddresses.Type;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * The MultipleAddressesProvider parses {@link MultipleAddresses} packets.
@@ -43,9 +43,9 @@ public class MultipleAddressesProvider extends ExtensionElementProvider<Multiple
                     IOException {
         MultipleAddresses multipleAddresses = new MultipleAddresses();
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case MultipleAddresses.Address.ELEMENT:
@@ -61,11 +61,14 @@ public class MultipleAddressesProvider extends ExtensionElementProvider<Multiple
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return multipleAddresses;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java
index ebc17dd29..cafcb5b36 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/admin/ServiceAdministrationManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2016 Florian Schmaus
+ * Copyright 2016-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,11 +30,9 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smackx.commands.AdHocCommandManager;
 import org.jivesoftware.smackx.commands.RemoteCommand;
 import org.jivesoftware.smackx.xdata.Form;
-import org.jivesoftware.smackx.xdata.FormField;
 
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.Jid;
-import org.jxmpp.jid.util.JidUtil;
 
 public class ServiceAdministrationManager extends Manager {
 
@@ -76,14 +74,9 @@ public class ServiceAdministrationManager extends Manager {
 
         Form answerForm = command.getForm().createAnswerForm();
 
-        FormField accountJidField = answerForm.getField("accountjid");
-        accountJidField.addValue(userJid.toString());
-
-        FormField passwordField = answerForm.getField("password");
-        passwordField.addValue(password);
-
-        FormField passwordVerifyField = answerForm.getField("password-verify");
-        passwordVerifyField.addValue(password);
+        answerForm.setAnswer("accountjid", userJid);
+        answerForm.setAnswer("password", password);
+        answerForm.setAnswer("password-verify", password);
 
         command.execute(answerForm);
         assert (command.isCompleted());
@@ -110,8 +103,7 @@ public class ServiceAdministrationManager extends Manager {
 
         Form answerForm = command.getForm().createAnswerForm();
 
-        FormField accountJids = answerForm.getField("accountjids");
-        accountJids.addValues(JidUtil.toStringList(jidsToDelete));
+        answerForm.setAnswer("accountjids", jidsToDelete);
 
         command.execute(answerForm);
         assert (command.isCompleted());
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
index ce0dcba39..01fb81574 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
@@ -21,15 +21,14 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.amp.AMPDeliverCondition;
 import org.jivesoftware.smackx.amp.AMPExpireAtCondition;
 import org.jivesoftware.smackx.amp.AMPMatchResourceCondition;
 import org.jivesoftware.smackx.amp.packet.AMPExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 
 public class AMPExtensionProvider extends ExtensionElementProvider<AMPExtension> {
     private static final Logger LOGGER = Logger.getLogger(AMPExtensionProvider.class.getName());
@@ -67,8 +66,8 @@ public class AMPExtensionProvider extends ExtensionElementProvider<AMPExtension>
 
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals(AMPExtension.Rule.ELEMENT)) {
                     String actionString = parser.getAttributeValue(null, AMPExtension.Action.ATTRIBUTE_NAME);
                     String conditionName = parser.getAttributeValue(null, AMPExtension.Condition.ATTRIBUTE_NAME);
@@ -91,7 +90,7 @@ public class AMPExtensionProvider extends ExtensionElementProvider<AMPExtension>
                         ampExtension.addRule(rule);
                     }
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(AMPExtension.ELEMENT)) {
                     done = true;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java
index 9afb75d30..cdc47d2cc 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java
@@ -19,8 +19,7 @@ package org.jivesoftware.smackx.attention.packet;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 /**
  * A PacketExtension that implements XEP-0224: Attention
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java
index dcfa17d31..9f8b68a3a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockContactsIQProvider.java
@@ -23,12 +23,12 @@ import java.util.List;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.blocking.element.BlockContactsIQ;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Block contact IQ provider class.
@@ -44,23 +44,24 @@ public class BlockContactsIQProvider extends IQProvider<BlockContactsIQ> {
         List<Jid> jids = new ArrayList<>();
 
         outerloop: while (true) {
-            int eventType = parser.next();
-
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 if (parser.getName().equals("item")) {
                     Jid jid = ParserUtils.getJidAttribute(parser);
                     jids.add(jid);
                 }
                 break;
 
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
 
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java
index 617d6f02b..1cf859609 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockListIQProvider.java
@@ -24,12 +24,12 @@ import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.blocking.element.BlockListIQ;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Block list IQ provider class.
@@ -45,11 +45,9 @@ public class BlockListIQProvider extends IQProvider<BlockListIQ> {
         List<Jid> jids = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
-
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 if (parser.getName().equals("item")) {
                     if (jids == null) {
                         jids = new ArrayList<>();
@@ -59,12 +57,15 @@ public class BlockListIQProvider extends IQProvider<BlockListIQ> {
                 }
                 break;
 
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
 
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java
index 6192a90bc..51e88edc4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/BlockedErrorExtensionProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.blocking.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.blocking.element.BlockedErrorExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Blocked error extension class.
  *
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java
index 37fac82fa..afee9f93a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/provider/UnblockContactsIQProvider.java
@@ -22,13 +22,13 @@ import java.util.List;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.blocking.element.UnblockContactsIQ;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Unblock contact IQ provider class.
@@ -44,11 +44,9 @@ public class UnblockContactsIQProvider extends IQProvider<UnblockContactsIQ> {
         List<Jid> jids = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
-
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 if (parser.getName().equals("item")) {
                     if (jids == null) {
                         jids = new ArrayList<>();
@@ -57,12 +55,15 @@ public class UnblockContactsIQProvider extends IQProvider<UnblockContactsIQ> {
                 }
                 break;
 
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
 
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java
index 0b79ffada..36f820256 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/provider/BoBIQProvider.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2017 Florian Schmaus
+ * Copyright 2017-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,14 +21,13 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.bob.BoBData;
 import org.jivesoftware.smackx.bob.BoBHash;
 import org.jivesoftware.smackx.bob.element.BoBIQ;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Bits of Binary IQ provider class.
  *
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
index f89e40f49..ddea3dfec 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java
@@ -22,14 +22,14 @@ import java.util.List;
 
 import org.jivesoftware.smack.util.ParserUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
 import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider;
 
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.parts.Resourcepart;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Bookmarks is used for storing and retrieving URLS and Conference rooms.
@@ -224,19 +224,19 @@ public class Bookmarks implements PrivateData {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "url".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "url".equals(parser.getName())) {
                     final BookmarkedURL urlStorage = getURLStorage(parser);
                     if (urlStorage != null) {
                         storage.addBookmarkedURL(urlStorage);
                     }
                 }
-                else if (eventType == XmlPullParser.START_TAG &&
+                else if (eventType == XmlPullParser.Event.START_ELEMENT &&
                         "conference".equals(parser.getName())) {
                     final BookmarkedConference conference = getConferenceStorage(parser);
                     storage.addBookmarkedConference(conference);
                 }
-                else if (eventType == XmlPullParser.END_TAG && "storage".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "storage".equals(parser.getName())) {
                     done = true;
                 }
             }
@@ -255,12 +255,12 @@ public class Bookmarks implements PrivateData {
         BookmarkedURL urlStore = new BookmarkedURL(url, name, rss);
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT
                         && "shared_bookmark".equals(parser.getName())) {
                     urlStore.setShared(true);
             }
-            else if (eventType == XmlPullParser.END_TAG && "url".equals(parser.getName())) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && "url".equals(parser.getName())) {
                 done = true;
             }
         }
@@ -279,19 +279,19 @@ public class Bookmarks implements PrivateData {
         // Check for nickname
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG && "nick".equals(parser.getName())) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT && "nick".equals(parser.getName())) {
                 String nickString = parser.nextText();
                 conf.setNickname(Resourcepart.from(nickString));
             }
-            else if (eventType == XmlPullParser.START_TAG && "password".equals(parser.getName())) {
+            else if (eventType == XmlPullParser.Event.START_ELEMENT && "password".equals(parser.getName())) {
                 conf.setPassword(parser.nextText());
             }
-            else if (eventType == XmlPullParser.START_TAG
+            else if (eventType == XmlPullParser.Event.START_ELEMENT
                         && "shared_bookmark".equals(parser.getName())) {
                     conf.setShared(true);
             }
-            else if (eventType == XmlPullParser.END_TAG && "conference".equals(parser.getName())) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && "conference".equals(parser.getName())) {
                 done = true;
             }
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
index 5c2a81d3e..059e11187 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
@@ -16,13 +16,13 @@
  */
 package org.jivesoftware.smackx.bytestreams;
 
-import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Exception.NoSocks5StreamHostsProvided;
 
 import org.jxmpp.jid.Jid;
 
@@ -57,10 +57,12 @@ public interface BytestreamRequest {
      * @throws XMPPErrorException if an error occurred while accepting the bytestream request
      * @throws InterruptedException if the thread was interrupted while waiting in a blocking
      *         operation
-     * @throws NoResponseException
-     * @throws SmackException
+     * @throws NotConnectedException
+     * @throws CouldNotConnectToAnyProvidedSocks5Host
+     * @throws NoSocks5StreamHostsProvided
      */
-    BytestreamSession accept() throws InterruptedException, XMPPErrorException, SmackException;
+    BytestreamSession accept() throws InterruptedException, XMPPErrorException, CouldNotConnectToAnyProvidedSocks5Host,
+                    NotConnectedException, NoSocks5StreamHostsProvided;
 
     /**
      * Rejects the bytestream request by sending a reject error to the initiator.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index 63dbadf58..148a6a676 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -20,7 +20,6 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -36,6 +35,7 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.util.StringUtils;
 
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamManager;
@@ -138,9 +138,6 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
     /* prefix used to generate session IDs */
     private static final String SESSION_ID_PREFIX = "jibb_";
 
-    /* random generator to create session IDs */
-    private static final Random randomGenerator = new Random();
-
     /* stores one InBandBytestreamManager for each XMPP connection */
     private static final Map<XMPPConnection, InBandBytestreamManager> managers = new WeakHashMap<>();
 
@@ -490,7 +487,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
     private static String getNextSessionID() {
         StringBuilder buffer = new StringBuilder();
         buffer.append(SESSION_ID_PREFIX);
-        buffer.append(randomGenerator.nextInt(Integer.MAX_VALUE) + randomGenerator.nextInt(Integer.MAX_VALUE));
+        buffer.append(StringUtils.secureOnlineAttackSafeRandomString());
         return buffer.toString();
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
index 68e36908a..f6fbf0a69 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.bytestreams.ibb.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Parses a close In-Band Bytestream packet.
  *
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
index f459aa671..6db9ed434 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
@@ -20,12 +20,12 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parses an In-Band Bytestream data stanza which can be a stanza extension of
  * either an IQ stanza or a message stanza.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
index 77e1dc769..bcb10dbb8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
@@ -21,13 +21,12 @@ import java.util.Locale;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
 import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parses an In-Band Bytestream open packet.
  *
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 7daf62c85..24e4fad16 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.bytestreams.socks5;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,7 +25,6 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -44,6 +44,7 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.util.StringUtils;
 
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamManager;
@@ -56,6 +57,7 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 import org.jivesoftware.smackx.disco.packet.DiscoverItems.Item;
 import org.jivesoftware.smackx.filetransfer.FileTransferManager;
 
+import org.jxmpp.jid.EntityFullJid;
 import org.jxmpp.jid.Jid;
 
 /**
@@ -113,9 +115,6 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
     /* prefix used to generate session IDs */
     private static final String SESSION_ID_PREFIX = "js5_";
 
-    /* random generator to create session IDs */
-    private static final Random randomGenerator = new Random();
-
     /* stores one Socks5BytestreamManager for each XMPP connection */
     private static final Map<XMPPConnection, Socks5BytestreamManager> managers = new WeakHashMap<>();
 
@@ -149,6 +148,8 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
     /* flag to enable/disable prioritization of last working proxy */
     private boolean proxyPrioritizationEnabled = true;
 
+    private boolean annouceLocalStreamHost = true;
+
     /*
      * list containing session IDs of SOCKS5 Bytestream initialization packets that should be
      * ignored by the InitiationListener
@@ -375,6 +376,30 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
         this.proxyPrioritizationEnabled = proxyPrioritizationEnabled;
     }
 
+    /**
+     * Returns if the bytestream manager will announce the local stream host(s), i.e. the local SOCKS5 proxy.
+     * <p>
+     * Local stream hosts will be announced if this option is enabled and at least one is running.
+     * </p>
+     *
+     * @return <code>true</code> if
+     * @since 4.4.0
+     */
+    public boolean isAnnouncingLocalStreamHostEnabled() {
+        return annouceLocalStreamHost;
+    }
+
+    /**
+     * Set whether or not the bytestream manager will annouce the local stream host(s), i.e. the local SOCKS5 proxy.
+     *
+     * @param announceLocalStreamHost
+     * @see #isAnnouncingLocalStreamHostEnabled()
+     * @since 4.4.0
+     */
+    public void setAnnounceLocalStreamHost(boolean announceLocalStreamHost) {
+        this.annouceLocalStreamHost = announceLocalStreamHost;
+    }
+
     /**
      * Establishes a SOCKS5 Bytestream with the given user and returns the Socket to send/receive
      * data to/from the user.
@@ -463,12 +488,10 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
                 streamHosts.remove(selectedStreamHost);
                 streamHosts.add(0, selectedStreamHost);
             }
-
         }
 
         Socks5Proxy socks5Proxy = Socks5Proxy.getSocks5Proxy();
         try {
-
             // add transfer digest to local proxy to make transfer valid
             socks5Proxy.addTransfer(digest);
 
@@ -500,17 +523,14 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
             // negotiation successful, return the output stream
             return new Socks5BytestreamSession(socket, usedStreamHost.getJID().equals(
                             connection.getUser()));
-
         }
         catch (TimeoutException e) {
-            throw new IOException("Timeout while connecting to SOCKS5 proxy");
+            throw new IOException("Timeout while connecting to SOCKS5 proxy", e);
         }
         finally {
-
             // remove transfer digest if output stream is returned or an exception
             // occurred
             socks5Proxy.removeTransfer(digest);
-
         }
     }
 
@@ -592,10 +612,12 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
         XMPPConnection connection = connection();
         List<StreamHost> streamHosts = new ArrayList<>();
 
-        // add local proxy on first position if exists
-        List<StreamHost> localProxies = getLocalStreamHost();
-        if (localProxies != null) {
-            streamHosts.addAll(localProxies);
+        if (annouceLocalStreamHost) {
+            // add local proxy on first position if exists
+            List<StreamHost> localProxies = getLocalStreamHost();
+            if (localProxies != null) {
+                streamHosts.addAll(localProxies);
+            }
         }
 
         // query SOCKS5 proxies for network settings
@@ -636,34 +658,27 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
      *         is not running
      */
     public List<StreamHost> getLocalStreamHost() {
-        XMPPConnection connection = connection();
-        // get local proxy singleton
-        Socks5Proxy socks5Server = Socks5Proxy.getSocks5Proxy();
-
-        if (!socks5Server.isRunning()) {
-            // server is not running
-            return null;
-        }
-        List<String> addresses = socks5Server.getLocalAddresses();
-        if (addresses.isEmpty()) {
-            // local address could not be determined
-            return null;
-        }
-        final int port = socks5Server.getPort();
-
         List<StreamHost> streamHosts = new ArrayList<>();
-        outerloop: for (String address : addresses) {
-            // Prevent loopback addresses from appearing as streamhost
-            final String[] loopbackAddresses = { "127.0.0.1", "0:0:0:0:0:0:0:1", "::1" };
-            for (String loopbackAddress : loopbackAddresses) {
-                // Use 'startsWith' here since IPv6 addresses may have scope ID,
-                // ie. the part after the '%' sign.
-                if (address.startsWith(loopbackAddress)) {
-                    continue outerloop;
-                }
+
+        XMPPConnection connection = connection();
+        EntityFullJid myJid = connection.getUser();
+
+        for (Socks5Proxy socks5Server : Socks5Proxy.getRunningProxies()) {
+            List<InetAddress> addresses = socks5Server.getLocalAddresses();
+            if (addresses.isEmpty()) {
+                continue;
+            }
+
+            final int port = socks5Server.getPort();
+            for (InetAddress address : addresses) {
+                // Prevent loopback addresses from appearing as streamhost
+                if (address.isLoopbackAddress()) {
+                    continue;
+                }
+                streamHosts.add(new StreamHost(myJid, address, port));
             }
-            streamHosts.add(new StreamHost(connection.getUser(), address, port));
         }
+
         return streamHosts;
     }
 
@@ -736,7 +751,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
     private static String getNextSessionID() {
         StringBuilder buffer = new StringBuilder();
         buffer.append(SESSION_ID_PREFIX);
-        buffer.append(randomGenerator.nextInt(Integer.MAX_VALUE) + randomGenerator.nextInt(Integer.MAX_VALUE));
+        buffer.append(StringUtils.secureOnlineAttackSafeRandomString());
         return buffer.toString();
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
index cd226f1d5..1dda14dd5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
@@ -19,6 +19,8 @@ package org.jivesoftware.smackx.bytestreams.socks5;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
 import org.jivesoftware.smack.SmackException;
@@ -29,6 +31,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
 
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host;
+import org.jivesoftware.smackx.bytestreams.socks5.Socks5Exception.NoSocks5StreamHostsProvided;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 
@@ -53,12 +57,14 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
     private static final Cache<String, Integer> ADDRESS_BLACKLIST = new ExpirationCache<String, Integer>(
                     BLACKLIST_MAX_SIZE, BLACKLIST_LIFETIME);
 
+    private static int DEFAULT_CONNECTION_FAILURE_THRESHOLD = 2;
+
     /*
      * The number of connection failures it takes for a particular SOCKS5 proxy to be blacklisted.
      * When a proxy is blacklisted no more connection attempts will be made to it for a period of 2
      * hours.
      */
-    private static int CONNECTION_FAILURE_THRESHOLD = 2;
+    private int connectionFailureThreshold = DEFAULT_CONNECTION_FAILURE_THRESHOLD;
 
     /* the bytestream initialization request */
     private Bytestream bytestreamRequest;
@@ -72,6 +78,28 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
     /* minimum timeout to connect to one SOCKS5 proxy */
     private int minimumConnectTimeout = 2000;
 
+    /**
+     * Returns the default connection failure threshold.
+     *
+     * @return the default connection failure threshold.
+     * @see #setConnectFailureThreshold(int)
+     * @since 4.4.0
+     */
+    public static int getDefaultConnectFailureThreshold() {
+        return DEFAULT_CONNECTION_FAILURE_THRESHOLD;
+    }
+
+    /**
+     * Sets the default connection failure threshold.
+     *
+     * @param defaultConnectFailureThreshold the default connection failure threshold.
+     * @see #setConnectFailureThreshold(int)
+     * @since 4.4.0
+     */
+    public static void setDefaultConnectFailureThreshold(int defaultConnectFailureThreshold) {
+        DEFAULT_CONNECTION_FAILURE_THRESHOLD = defaultConnectFailureThreshold;
+    }
+
     /**
      * Returns the number of connection failures it takes for a particular SOCKS5 proxy to be
      * blacklisted. When a proxy is blacklisted no more connection attempts will be made to it for a
@@ -80,8 +108,8 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
      * @return the number of connection failures it takes for a particular SOCKS5 proxy to be
      *         blacklisted
      */
-    public static int getConnectFailureThreshold() {
-        return CONNECTION_FAILURE_THRESHOLD;
+    public int getConnectFailureThreshold() {
+        return connectionFailureThreshold;
     }
 
     /**
@@ -94,8 +122,8 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
      * @param connectFailureThreshold the number of connection failures it takes for a particular
      *        SOCKS5 proxy to be blacklisted
      */
-    public static void setConnectFailureThreshold(int connectFailureThreshold) {
-        CONNECTION_FAILURE_THRESHOLD = connectFailureThreshold;
+    public void setConnectFailureThreshold(int connectFailureThreshold) {
+        connectionFailureThreshold = connectFailureThreshold;
     }
 
     /**
@@ -197,15 +225,19 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
      * @return the socket to send/receive data
      * @throws InterruptedException if the current thread was interrupted while waiting
      * @throws XMPPErrorException
-     * @throws SmackException
+     * @throws NotConnectedException
+     * @throws CouldNotConnectToAnyProvidedSocks5Host
+     * @throws NoSocks5StreamHostsProvided
      */
     @Override
-    public Socks5BytestreamSession accept() throws InterruptedException, XMPPErrorException, SmackException {
+    public Socks5BytestreamSession accept() throws InterruptedException, XMPPErrorException,
+                    CouldNotConnectToAnyProvidedSocks5Host, NotConnectedException, NoSocks5StreamHostsProvided {
         Collection<StreamHost> streamHosts = this.bytestreamRequest.getStreamHosts();
 
+        Map<StreamHost, Exception> streamHostsExceptions = new HashMap<>();
         // throw exceptions if request contains no stream hosts
         if (streamHosts.size() == 0) {
-            cancelRequest();
+            cancelRequest(streamHostsExceptions);
         }
 
         StreamHost selectedHost = null;
@@ -226,7 +258,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
 
             // check to see if this address has been blacklisted
             int failures = getConnectionFailures(address);
-            if (CONNECTION_FAILURE_THRESHOLD > 0 && failures >= CONNECTION_FAILURE_THRESHOLD) {
+            if (connectionFailureThreshold > 0 && failures >= connectionFailureThreshold) {
                 continue;
             }
 
@@ -245,6 +277,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
 
             }
             catch (TimeoutException | IOException | SmackException | XMPPException e) {
+                streamHostsExceptions.put(streamHost, e);
                 incrementConnectionFailures(address);
             }
 
@@ -252,7 +285,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
 
         // throw exception if connecting to all SOCKS5 proxies failed
         if (selectedHost == null || socket == null) {
-            cancelRequest();
+            cancelRequest(streamHostsExceptions);
         }
 
         // send used-host confirmation
@@ -277,16 +310,38 @@ public class Socks5BytestreamRequest implements BytestreamRequest {
     /**
      * Cancels the SOCKS5 Bytestream request by sending an error to the initiator and building a
      * XMPP exception.
-     * @throws XMPPErrorException
+     *
+     * @param streamHosts the stream hosts.
      * @throws NotConnectedException
      * @throws InterruptedException
+     * @throws CouldNotConnectToAnyProvidedSocks5Host as expected result.
+     * @throws NoSocks5StreamHostsProvided
      */
-    private void cancelRequest() throws XMPPErrorException, NotConnectedException, InterruptedException {
-        String errorMessage = "Could not establish socket with any provided host";
+    private void cancelRequest(Map<StreamHost, Exception> streamHostsExceptions)
+                    throws NotConnectedException, InterruptedException, CouldNotConnectToAnyProvidedSocks5Host, NoSocks5StreamHostsProvided {
+        final Socks5Exception.NoSocks5StreamHostsProvided noHostsProvidedException;
+        final Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host couldNotConnectException;
+        final String errorMessage;
+
+        if (streamHostsExceptions.isEmpty()) {
+            noHostsProvidedException = new Socks5Exception.NoSocks5StreamHostsProvided();
+            couldNotConnectException = null;
+            errorMessage = noHostsProvidedException.getMessage();
+        } else {
+            noHostsProvidedException = null;
+            couldNotConnectException = Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host.construct(streamHostsExceptions);
+            errorMessage = couldNotConnectException.getMessage();
+        }
+
         StanzaError.Builder error = StanzaError.from(StanzaError.Condition.item_not_found, errorMessage);
         IQ errorIQ = IQ.createErrorResponse(this.bytestreamRequest, error);
         this.manager.getConnection().sendStanza(errorIQ);
-        throw new XMPPErrorException(errorIQ, error.build());
+
+        if (noHostsProvidedException != null) {
+            throw noHostsProvidedException;
+        } else {
+            throw couldNotConnectException;
+        }
     }
 
     /**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
index 5ffecf1c3..d5350d4a5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
@@ -19,10 +19,10 @@ package org.jivesoftware.smackx.bytestreams.socks5;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -36,8 +36,9 @@ import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.SmackException.SmackMessageException;
 import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.util.Async;
 import org.jivesoftware.smack.util.CloseableUtil;
-import org.jivesoftware.smack.util.StringUtils;
+
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 
 /**
@@ -92,7 +93,7 @@ public class Socks5Client {
 
                 // initialize socket
                 Socket socket = new Socket();
-                SocketAddress socketAddress = new InetSocketAddress(streamHost.getAddress(),
+                SocketAddress socketAddress = new InetSocketAddress(streamHost.getAddress().asInetAddress(),
                                 streamHost.getPort());
                 socket.connect(socketAddress);
 
@@ -111,27 +112,14 @@ public class Socks5Client {
             }
 
         });
-        Thread executor = new Thread(futureTask);
-        executor.start();
+        Async.go(futureTask, "SOCKS5 client connecting to " + streamHost);
 
         // get connection to initiator with timeout
         try {
             return futureTask.get(timeout, TimeUnit.MILLISECONDS);
         }
         catch (ExecutionException e) {
-            Throwable cause = e.getCause();
-            if (cause != null) {
-                // case exceptions to comply with method signature
-                if (cause instanceof IOException) {
-                    throw (IOException) cause;
-                }
-                if (cause instanceof SmackMessageException) {
-                    throw (SmackMessageException) cause;
-                }
-            }
-
-            // throw generic Smack exception if unexpected exception was thrown
-            throw new IllegalStateException("Error while connecting to SOCKS5 proxy", e);
+            throw new IOException("ExecutionException while SOCKS5 client attempting to connect to " + streamHost, e);
         }
 
     }
@@ -201,13 +189,7 @@ public class Socks5Client {
      * @return SOCKS5 connection request message
      */
     private byte[] createSocks5ConnectRequest() {
-        byte[] addr;
-        try {
-            addr = digest.getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        byte[] addr = digest.getBytes(StandardCharsets.UTF_8);
 
         byte[] data = new byte[7 + addr.length];
         data[0] = (byte) 0x05; // version (SOCKS5)
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 714e849af..adca9931f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -79,8 +79,7 @@ public class Socks5ClientForInitiator extends Socks5Client {
 
         // check if stream host is the local SOCKS5 proxy
         if (this.streamHost.getJID().equals(this.connection.get().getUser())) {
-            Socks5Proxy socks5Server = Socks5Proxy.getSocks5Proxy();
-            socket = socks5Server.getSocket(this.digest);
+            socket = Socks5Proxy.getSocketForDigest(this.digest);
             if (socket == null) {
                 throw new SmackException.SmackMessageException("target is not connected to SOCKS5 proxy");
             }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Exception.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Exception.java
new file mode 100644
index 000000000..c4aa4fe17
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Exception.java
@@ -0,0 +1,87 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.bytestreams.socks5;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jivesoftware.smack.SmackException;
+
+import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
+
+public abstract class Socks5Exception extends SmackException {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    protected Socks5Exception(String message) {
+        super(message);
+    }
+
+    public static final class NoSocks5StreamHostsProvided extends Socks5Exception {
+        /**
+         *
+         */
+        private static final long serialVersionUID = 1L;
+
+        NoSocks5StreamHostsProvided() {
+            super("No SOCKS5 stream hosts provided.");
+        }
+    }
+
+    public static final class CouldNotConnectToAnyProvidedSocks5Host extends Socks5Exception {
+
+        /**
+         *
+         */
+        private static final long serialVersionUID = 1L;
+
+        private final Map<StreamHost, Exception> streamHostsExceptions;
+
+        private CouldNotConnectToAnyProvidedSocks5Host(String message, Map<StreamHost, Exception> streamHostsExceptions) {
+            super(message);
+            this.streamHostsExceptions = Collections.unmodifiableMap(streamHostsExceptions);
+        }
+
+        public Map<StreamHost, Exception> getStreamHostsExceptions() {
+            return streamHostsExceptions;
+        }
+
+        static CouldNotConnectToAnyProvidedSocks5Host construct(Map<StreamHost, Exception> streamHostsExceptions) {
+            assert !streamHostsExceptions.isEmpty();
+
+            StringBuilder sb = new StringBuilder(256);
+            sb.append("Could not establish socket with any provided SOCKS5 stream host.");
+            Iterator<StreamHost> it = streamHostsExceptions.keySet().iterator();
+            while (it.hasNext()) {
+                StreamHost streamHost = it.next();
+                Exception exception = streamHostsExceptions.get(streamHost);
+
+                sb.append(' ').append(streamHost).append(" Exception: '").append(exception).append('\'');
+                if (it.hasNext()) {
+                    sb.append(',');
+                }
+            }
+
+            String message = sb.toString();
+            return new CouldNotConnectToAnyProvidedSocks5Host(message, streamHostsExceptions);
+        }
+    }
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
index 2acf2e8f0..fec1bd113 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
@@ -20,10 +20,12 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -34,12 +36,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.util.CloseableUtil;
-import org.jivesoftware.smack.util.StringUtils;
 
 /**
  * The Socks5Proxy class represents a local SOCKS5 proxy server. It can be enabled/disabled by
@@ -51,7 +53,7 @@ import org.jivesoftware.smack.util.StringUtils;
  * <p>
  * If your application is running on a machine with multiple network interfaces or if you want to
  * provide your public address in case you are behind a NAT router, invoke
- * {@link #addLocalAddress(String)} or {@link #replaceLocalAddresses(Collection)} to modify the list of
+ * {@link #addLocalAddress(InetAddress)} or {@link #replaceLocalAddresses(Collection)} to modify the list of
  * local network addresses used for outgoing SOCKS5 Bytestream requests.
  * <p>
  * The local SOCKS5 proxy server refuses all connections except the ones that are explicitly allowed
@@ -70,22 +72,30 @@ import org.jivesoftware.smack.util.StringUtils;
  *
  * @author Henning Staib
  */
-public final class Socks5Proxy {
+public class Socks5Proxy {
     private static final Logger LOGGER = Logger.getLogger(Socks5Proxy.class.getName());
 
+    private static final List<Socks5Proxy> RUNNING_PROXIES = new CopyOnWriteArrayList<>();
+
     /* SOCKS5 proxy singleton */
     private static Socks5Proxy socks5Server;
 
     private static boolean localSocks5ProxyEnabled = true;
 
+    /**
+     * The default port of the local Socks5 Proxy. If this value is negative, the next ports will be tried
+     * until a unused is found.
+     */
+    private static int DEFAULT_LOCAL_SOCKS5_PROXY_PORT = -7777;
+
     /**
      * The port of the local Socks5 Proxy. If this value is negative, the next ports will be tried
      * until a unused is found.
      */
-    private static int localSocks5ProxyPort = -7777;
+    private int localSocks5ProxyPort = -7777;
 
     /* reusable implementation of a SOCKS5 proxy server process */
-    private Socks5ServerProcess serverProcess;
+    private final Socks5ServerProcess serverProcess;
 
     /* thread running the SOCKS5 server process */
     private Thread serverThread;
@@ -99,37 +109,57 @@ public final class Socks5Proxy {
     /* list of digests connections should be stored */
     private final List<String> allowedConnections = Collections.synchronizedList(new LinkedList<String>());
 
-    private final Set<String> localAddresses = new LinkedHashSet<>(4);
+    private final Set<InetAddress> localAddresses = new LinkedHashSet<>(4);
+
+    /**
+     * If set to <code>true</code>, then all connections are allowed and the digest is not verified. Should be set to
+     * <code>false</code> for production usage and <code>true</code> for (unit) testing purposes.
+     */
+    private final boolean allowAllConnections;
 
     /**
      * Private constructor.
      */
-    private Socks5Proxy() {
+    Socks5Proxy() {
         this.serverProcess = new Socks5ServerProcess();
 
+        allowAllConnections = false;
+
         Enumeration<NetworkInterface> networkInterfaces;
         try {
             networkInterfaces = NetworkInterface.getNetworkInterfaces();
         } catch (SocketException e) {
             throw new IllegalStateException(e);
         }
-        Set<String> localHostAddresses = new HashSet<>();
+        Set<InetAddress> localAddresses = new HashSet<>();
         for (NetworkInterface networkInterface : Collections.list(networkInterfaces)) {
-            // We can't use NetworkInterface.getInterfaceAddresses here, which
-            // would return a List instead the deprecated Enumeration, because
-            // it's Android API 9 and Smack currently uses 8. Change that when
-            // we raise Smack's minimum Android API.
-            Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
-            for (InetAddress address : Collections.list(inetAddresses)) {
-                localHostAddresses.add(address.getHostAddress());
+            List<InterfaceAddress> interfaceAddresses = networkInterface.getInterfaceAddresses();
+            for (InterfaceAddress interfaceAddress : interfaceAddresses) {
+                localAddresses.add(interfaceAddress.getAddress());
             }
         }
-        if (localHostAddresses.isEmpty()) {
-            throw new IllegalStateException("Could not determine any local host address");
+        if (localAddresses.isEmpty()) {
+            throw new IllegalStateException("Could not determine any local internet address");
         }
-        replaceLocalAddresses(localHostAddresses);
+        replaceLocalAddresses(localAddresses);
     }
 
+    /**
+     * Constructor a Socks5Proxy with the given socket. Used for unit test purposes.
+     *
+     * @param serverSocket the server socket to use
+     */
+    protected Socks5Proxy(ServerSocket serverSocket) {
+        this.serverProcess = new Socks5ServerProcess();
+        this.serverSocket = serverSocket;
+
+        allowAllConnections = true;
+
+        startServerThread();
+    }
+
+
+
    /**
     * Returns true if the local Socks5 proxy should be started. Default is true.
     *
@@ -148,12 +178,27 @@ public final class Socks5Proxy {
        Socks5Proxy.localSocks5ProxyEnabled = localSocks5ProxyEnabled;
    }
 
+   private static void checkLocalSocks5ProxyPortArgument(int port) {
+       if (Math.abs(port) > 65535) {
+           throw new IllegalArgumentException("Local SOCKS5 proxy port must be within (-65535,65535)");
+       }
+   }
+
+   public static int getDefaultLocalSocks5ProxyPort() {
+       return DEFAULT_LOCAL_SOCKS5_PROXY_PORT;
+   }
+
+   public static void setDefaultLocalSocsk5ProxyPort(int defaultLocalSocks5ProxyPort) {
+       checkLocalSocks5ProxyPortArgument(defaultLocalSocks5ProxyPort);
+       DEFAULT_LOCAL_SOCKS5_PROXY_PORT = defaultLocalSocks5ProxyPort;
+   }
+
    /**
     * Return the port of the local Socks5 proxy. Default is 7777.
     *
     * @return the port of the local Socks5 proxy
     */
-   public static int getLocalSocks5ProxyPort() {
+   public int getLocalSocks5ProxyPort() {
        return localSocks5ProxyPort;
    }
 
@@ -163,11 +208,9 @@ public final class Socks5Proxy {
     *
     * @param localSocks5ProxyPort the port of the local Socks5 proxy to set
     */
-   public static void setLocalSocks5ProxyPort(int localSocks5ProxyPort) {
-       if (Math.abs(localSocks5ProxyPort) > 65535) {
-           throw new IllegalArgumentException("localSocks5ProxyPort must be within (-65535,65535)");
-       }
-       Socks5Proxy.localSocks5ProxyPort = localSocks5ProxyPort;
+   public void setLocalSocks5ProxyPort(int localSocks5ProxyPort) {
+       checkLocalSocks5ProxyPortArgument(localSocks5ProxyPort);
+       this.localSocks5ProxyPort = localSocks5ProxyPort;
    }
 
     /**
@@ -188,9 +231,9 @@ public final class Socks5Proxy {
     /**
      * Starts the local SOCKS5 proxy server. If it is already running, this method does nothing.
      */
-    public synchronized void start() {
+    public synchronized ServerSocket start() {
         if (isRunning()) {
-            return;
+            return this.serverSocket;
         }
         try {
             if (getLocalSocks5ProxyPort() < 0) {
@@ -210,16 +253,24 @@ public final class Socks5Proxy {
             }
 
             if (this.serverSocket != null) {
-                this.serverThread = new Thread(this.serverProcess);
-                this.serverThread.setName("Smack Local SOCKS5 Proxy");
-                this.serverThread.setDaemon(true);
-                this.serverThread.start();
+                startServerThread();
             }
         }
         catch (IOException e) {
             // couldn't setup server
             LOGGER.log(Level.SEVERE, "couldn't setup local SOCKS5 proxy on port " + getLocalSocks5ProxyPort(), e);
         }
+
+        return this.serverSocket;
+    }
+
+    private synchronized void startServerThread() {
+        this.serverThread = new Thread(this.serverProcess);
+        this.serverThread.setName("Smack Local SOCKS5 Proxy [" + this.serverSocket + ']');
+        this.serverThread.setDaemon(true);
+
+        RUNNING_PROXIES.add(this);
+        this.serverThread.start();
     }
 
     /**
@@ -230,12 +281,9 @@ public final class Socks5Proxy {
             return;
         }
 
-        try {
-            this.serverSocket.close();
-        }
-        catch (IOException e) {
-            // do nothing
-        }
+        RUNNING_PROXIES.remove(this);
+
+        CloseableUtil.maybeClose(this.serverSocket, LOGGER);
 
         if (this.serverThread != null && this.serverThread.isAlive()) {
             try {
@@ -243,12 +291,11 @@ public final class Socks5Proxy {
                 this.serverThread.join();
             }
             catch (InterruptedException e) {
-                // do nothing
+                LOGGER.log(Level.WARNING, "SOCKS5 server thread termination was interrupted", e);
             }
         }
         this.serverThread = null;
         this.serverSocket = null;
-
     }
 
     /**
@@ -266,7 +313,7 @@ public final class Socks5Proxy {
      *
      * @param address the local network address to add
      */
-    public void addLocalAddress(String address) {
+    public void addLocalAddress(InetAddress address) {
         if (address == null) {
             return;
         }
@@ -282,7 +329,7 @@ public final class Socks5Proxy {
      * @param address the local network address to remove
      * @return true if the address was removed.
      */
-    public boolean removeLocalAddress(String address) {
+    public boolean removeLocalAddress(InetAddress address) {
         synchronized (localAddresses) {
             return localAddresses.remove(address);
         }
@@ -294,7 +341,7 @@ public final class Socks5Proxy {
      *
      * @return set of the local network addresses
      */
-    public List<String> getLocalAddresses() {
+    public List<InetAddress> getLocalAddresses() {
         synchronized (localAddresses) {
             return new LinkedList<>(localAddresses);
         }
@@ -310,7 +357,7 @@ public final class Socks5Proxy {
      *
      * @param addresses the new list of local network addresses
      */
-    public void replaceLocalAddresses(Collection<String> addresses) {
+    public void replaceLocalAddresses(Collection<? extends InetAddress> addresses) {
         if (addresses == null) {
             throw new IllegalArgumentException("list must not be null");
         }
@@ -388,33 +435,23 @@ public final class Socks5Proxy {
         @Override
         public void run() {
             while (true) {
+                ServerSocket serverSocket = Socks5Proxy.this.serverSocket;
+                if (serverSocket == null || serverSocket.isClosed() || Thread.currentThread().isInterrupted()) {
+                    return;
+                }
+
+                // accept connection
                 Socket socket = null;
-
                 try {
-
-                    if (Socks5Proxy.this.serverSocket == null || Socks5Proxy.this.serverSocket.isClosed()
-                                    || Thread.currentThread().isInterrupted()) {
-                        return;
-                    }
-
-                    // accept connection
-                    socket = Socks5Proxy.this.serverSocket.accept();
-
+                    socket = serverSocket.accept();
                     // initialize connection
                     establishConnection(socket);
-
-                }
-                catch (SocketException e) {
-                    /*
-                     * do nothing, if caused by closing the server socket, thread will terminate in
-                     * next loop
-                     */
-                }
-                catch (Exception e) {
+                } catch (SmackException | IOException e) {
+                    // Do nothing, if caused by closing the server socket, thread will terminate in next loop.
+                    LOGGER.log(Level.FINE, "Exception while " + Socks5Proxy.this + " was handling connection", e);
                     CloseableUtil.maybeClose(socket, LOGGER);
                 }
             }
-
         }
 
         /**
@@ -431,7 +468,7 @@ public final class Socks5Proxy {
             // first byte is version should be 5
             int b = in.read();
             if (b != 5) {
-                throw new SmackException.SmackMessageException("Only SOCKS5 supported");
+                throw new SmackException.SmackMessageException("Only SOCKS5 supported: Peer send " + b + " but we expect 5");
             }
 
             // second byte number of authentication methods supported
@@ -468,25 +505,39 @@ public final class Socks5Proxy {
             byte[] connectionRequest = Socks5Utils.receiveSocks5Message(in);
 
             // extract digest
-            String responseDigest = new String(connectionRequest, 5, connectionRequest[4], StringUtils.UTF8);
+            String responseDigest = new String(connectionRequest, 5, connectionRequest[4], StandardCharsets.UTF_8);
 
             // return error if digest is not allowed
-            if (!Socks5Proxy.this.allowedConnections.contains(responseDigest)) {
+            if (!allowAllConnections && !Socks5Proxy.this.allowedConnections.contains(responseDigest)) {
                 connectionRequest[1] = (byte) 0x05; // set return status to 5 (connection refused)
                 out.write(connectionRequest);
                 out.flush();
 
-                throw new SmackException.SmackMessageException("Connection is not allowed");
+                throw new SmackException.SmackMessageException(
+                                "Connection with digest '" + responseDigest + "' is not allowed");
             }
 
+            // Store the connection before we send the return status.
+            Socks5Proxy.this.connectionMap.put(responseDigest, socket);
+
             connectionRequest[1] = (byte) 0x00; // set return status to 0 (success)
             out.write(connectionRequest);
             out.flush();
-
-            // store connection
-            Socks5Proxy.this.connectionMap.put(responseDigest, socket);
         }
 
     }
 
+    public static Socket getSocketForDigest(String digest) {
+        for (Socks5Proxy socks5Proxy : RUNNING_PROXIES) {
+            Socket socket = socks5Proxy.getSocket(digest);
+            if (socket != null) {
+                return socket;
+            }
+        }
+        return null;
+    }
+
+    static List<Socks5Proxy> getRunningProxies() {
+        return RUNNING_PROXIES;
+    }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
index 0ea6019af..e51b10061 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
@@ -16,14 +16,15 @@
  */
 package org.jivesoftware.smackx.bytestreams.socks5.packet;
 
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.NamedElement;
+import org.jivesoftware.smack.util.InternetAddress;
 import org.jivesoftware.smack.util.Objects;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jxmpp.jid.Jid;
@@ -117,7 +118,7 @@ public class Bytestream extends IQ {
      * @param address The internet address of the stream host.
      * @return The added stream host.
      */
-    public StreamHost addStreamHost(final Jid JID, final String address) {
+    public StreamHost addStreamHost(final Jid JID, String address) {
         return addStreamHost(JID, address, 0);
     }
 
@@ -129,7 +130,7 @@ public class Bytestream extends IQ {
      * @param port The port on which the remote host is seeking connections.
      * @return The added stream host.
      */
-    public StreamHost addStreamHost(final Jid JID, final String address, final int port) {
+    public StreamHost addStreamHost(final Jid JID, String address, final int port) {
         StreamHost host = new StreamHost(JID, address, port);
         addStreamHost(host);
 
@@ -271,7 +272,7 @@ public class Bytestream extends IQ {
 
         private final Jid jid;
 
-        private final String address;
+        private final InternetAddress address;
 
         private final int port;
 
@@ -287,8 +288,23 @@ public class Bytestream extends IQ {
          * @param port port of the stream host.
          */
         public StreamHost(final Jid jid, final String address, int port) {
+            this(jid, InternetAddress.from(address), port);
+        }
+
+        public StreamHost(Jid jid, InetAddress address, int port) {
+            this(jid, InternetAddress.from(address), port);
+        }
+
+        /**
+         * Stream Host constructor.
+         *
+         * @param jid The JID of the stream host.
+         * @param address The internet address of the stream host.
+         * @param port port of the stream host.
+         */
+        public StreamHost(Jid jid, InternetAddress address, int port) {
             this.jid = Objects.requireNonNull(jid, "StreamHost JID must not be null");
-            this.address = StringUtils.requireNotNullNorEmpty(address, "StreamHost address must not be null");
+            this.address = Objects.requireNonNull(address);
             this.port = port;
         }
 
@@ -306,7 +322,7 @@ public class Bytestream extends IQ {
          *
          * @return Returns the internet address of the stream host.
          */
-        public String getAddress() {
+        public InternetAddress getAddress() {
             return address;
         }
 
@@ -328,7 +344,7 @@ public class Bytestream extends IQ {
         public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
             XmlStringBuilder xml = new XmlStringBuilder(this);
             xml.attribute("jid", getJID());
-            xml.attribute("host", getAddress());
+            xml.attribute("host", address);
             if (getPort() != 0) {
                 xml.attribute("port", Integer.toString(getPort()));
             } else {
@@ -337,6 +353,11 @@ public class Bytestream extends IQ {
             xml.closeEmptyElement();
             return xml;
         }
+
+        @Override
+        public String toString() {
+            return "SOCKS5 Stream Host: " + jid + "[" + address + ":" + port + "]";
+        }
     }
 
     /**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
index e1d236d5a..92aba36c0 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
@@ -21,13 +21,13 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.Mode;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Parses a bytestream packet.
@@ -51,12 +51,12 @@ public class BytestreamsProvider extends IQProvider<Bytestream> {
         String host = null;
         String port = null;
 
-        int eventType;
+        XmlPullParser.Event eventType;
         String elementName;
         while (!done) {
             eventType = parser.next();
             elementName = parser.getName();
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (elementName.equals(Bytestream.StreamHost.ELEMENTNAME)) {
                     JID = ParserUtils.getJidAttribute(parser);
                     host = parser.getAttributeValue("", "host");
@@ -69,7 +69,7 @@ public class BytestreamsProvider extends IQProvider<Bytestream> {
                     toReturn.setToActivate(ParserUtils.getJidAttribute(parser));
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (elementName.equals("streamhost")) {
                     if (port == null) {
                         toReturn.addStreamHost(JID, host);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
index 5d35cf1b5..d75cb7036 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2009 Jonas Ådahl, 2011-2014 Florian Schmaus
+ * Copyright © 2009 Jonas Ådahl, 2011-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.caps;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Comparator;
@@ -749,13 +749,7 @@ public final class EntityCapsManager extends Manager {
         // encoded using Base64 as specified in Section 4 of RFC 4648
         // (note: the Base64 output MUST NOT include whitespace and MUST set
         // padding bits to zero).
-        byte[] bytes;
-        try {
-            bytes = sb.toString().getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        byte[] bytes = sb.toString().getBytes(StandardCharsets.UTF_8);
         byte[] digest;
         synchronized (md) {
             digest = md.digest(bytes);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
index 134a45d18..c00b87dd2 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java
@@ -20,19 +20,18 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.caps.EntityCapsManager;
 import org.jivesoftware.smackx.caps.packet.CapsExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class CapsExtensionProvider extends ExtensionElementProvider<CapsExtension> {
 
     @Override
     public CapsExtension parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
         String hash, version, node;
-        if (parser.getEventType() == XmlPullParser.START_TAG
+        if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT
                 && parser.getName().equalsIgnoreCase(EntityCapsManager.ELEMENT)) {
             hash = parser.getAttributeValue(null, "hash");
             version = parser.getAttributeValue(null, "ver");
@@ -44,7 +43,7 @@ public class CapsExtensionProvider extends ExtensionElementProvider<CapsExtensio
 
         parser.next();
 
-        if (!(parser.getEventType() == XmlPullParser.END_TAG
+        if (!(parser.getEventType() == XmlPullParser.Event.END_ELEMENT
                 && parser.getName().equalsIgnoreCase(EntityCapsManager.ELEMENT))) {
             // TODO: Should be SmackParsingException.
             throw new IOException("Malformed nested Caps element");
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
index e341e6a37..45dd4d54f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
@@ -43,6 +43,7 @@ import org.jivesoftware.smack.filter.StanzaFilter;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.chatstates.packet.ChatStateExtension;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java
index 4d06d650c..2f5bbe24e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/provider/ChatStateExtensionProvider.java
@@ -18,12 +18,11 @@ package org.jivesoftware.smackx.chatstates.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.chatstates.ChatState;
 import org.jivesoftware.smackx.chatstates.packet.ChatStateExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class ChatStateExtensionProvider extends ExtensionElementProvider<ChatStateExtension> {
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index 8e60d6594..dd05857ae 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -20,10 +20,13 @@ package org.jivesoftware.smackx.commands;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -126,15 +129,6 @@ public final class AdHocCommandManager extends Manager {
 
     private final ServiceDiscoveryManager serviceDiscoveryManager;
 
-    /**
-     * Thread that reaps stale sessions.
-     */
-    // FIXME The session sweeping is horrible implemented. The thread will never stop running. A different approach must
-    // be implemented. For example one that does stop reaping sessions and the thread if there are no more, and restarts
-    // the reaping process on demand. Or for every command a scheduled task should be created that removes the session
-    // if it's timed out. See SMACK-624.
-    private Thread sessionsSweeper;
-
     private AdHocCommandManager(XMPPConnection connection) {
         super(connection);
         this.serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
@@ -186,8 +180,6 @@ public final class AdHocCommandManager extends Manager {
                 }
             }
         });
-
-        sessionsSweeper = null;
     }
 
     /**
@@ -380,49 +372,8 @@ public final class AdHocCommandManager extends Manager {
                     // available for the next call
                     response.setStatus(Status.executing);
                     executingCommands.put(sessionId, command);
-                    // See if the session reaping thread is started. If not, start it.
-                    if (sessionsSweeper == null) {
-                        sessionsSweeper = new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                while (true) {
-                                    for (String sessionId : executingCommands.keySet()) {
-                                        LocalCommand command = executingCommands.get(sessionId);
-                                        // Since the command could be removed in the meanwhile
-                                        // of getting the key and getting the value - by a
-                                        // processed packet. We must check if it still in the
-                                        // map.
-                                        if (command != null) {
-                                            long creationStamp = command.getCreationDate();
-                                            // Check if the Session data has expired (default is
-                                            // 10 minutes)
-                                            // To remove it from the session list it waits for
-                                            // the double of the of time out time. This is to
-                                            // let
-                                            // the requester know why his execution request is
-                                            // not accepted. If the session is removed just
-                                            // after the time out, then whe the user request to
-                                            // continue the execution he will received an
-                                            // invalid session error and not a time out error.
-                                            if (System.currentTimeMillis() - creationStamp > SESSION_TIMEOUT * 1000 * 2) {
-                                                // Remove the expired session
-                                                executingCommands.remove(sessionId);
-                                            }
-                                        }
-                                    }
-                                    try {
-                                        Thread.sleep(1000);
-                                    }
-                                    catch (InterruptedException ie) {
-                                        // Ignore.
-                                    }
-                                }
-                            }
-
-                        });
-                        sessionsSweeper.setDaemon(true);
-                        sessionsSweeper.start();
-                    }
+                    // See if the session sweeper thread is scheduled. If not, start it.
+                    maybeWindUpSessionSweeper();
                 }
 
                 // Sends the response packet
@@ -558,6 +509,47 @@ public final class AdHocCommandManager extends Manager {
         }
     }
 
+    private boolean sessionSweeperScheduled;
+
+    private final Runnable sessionSweeper = () -> {
+        final long currentTime = System.currentTimeMillis();
+        synchronized (this) {
+            for (Iterator<Entry<String, LocalCommand>> it = executingCommands.entrySet().iterator(); it.hasNext();) {
+                Entry<String, LocalCommand> entry = it.next();
+                LocalCommand command = entry.getValue();
+
+                long creationStamp = command.getCreationDate();
+                // Check if the Session data has expired (default is 10 minutes)
+                // To remove it from the session list it waits for the double of
+                // the of time out time. This is to let
+                // the requester know why his execution request is
+                // not accepted. If the session is removed just
+                // after the time out, then once the user requests to
+                // continue the execution he will received an
+                // invalid session error and not a time out error.
+                if (currentTime - creationStamp > SESSION_TIMEOUT * 1000 * 2) {
+                    // Remove the expired session
+                    it.remove();
+                }
+            }
+
+            sessionSweeperScheduled = false;
+        }
+
+        if (!executingCommands.isEmpty()) {
+            maybeWindUpSessionSweeper();
+        }
+    };
+
+    private synchronized void maybeWindUpSessionSweeper() {
+        if (sessionSweeperScheduled) {
+            return;
+        }
+
+        sessionSweeperScheduled = true;
+        schedule(sessionSweeper, 10, TimeUnit.SECONDS);
+    }
+
     /**
      * Responds an error with an specific condition.
      *
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java
index fcfb0beaa..22d7f7498 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java
@@ -25,6 +25,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.commands.AdHocCommand;
 import org.jivesoftware.smackx.commands.AdHocCommand.Action;
@@ -32,9 +34,6 @@ import org.jivesoftware.smackx.commands.AdHocCommandNote;
 import org.jivesoftware.smackx.commands.packet.AdHocCommandData;
 import org.jivesoftware.smackx.xdata.provider.DataFormProvider;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * The AdHocCommandDataProvider parses AdHocCommandData packets.
  *
@@ -48,7 +47,7 @@ public class AdHocCommandDataProvider extends IQProvider<AdHocCommandData> {
         AdHocCommandData adHocCommandData = new AdHocCommandData();
         DataFormProvider dataFormProvider = new DataFormProvider();
 
-        int eventType;
+        XmlPullParser.Event eventType;
         String elementName;
         String namespace;
         adHocCommandData.setSessionID(parser.getAttributeValue("", "sessionid"));
@@ -81,7 +80,7 @@ public class AdHocCommandDataProvider extends IQProvider<AdHocCommandData> {
             eventType = parser.next();
             elementName = parser.getName();
             namespace = parser.getNamespace();
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("actions")) {
                     String execute = parser.getAttributeValue("", "execute");
                     if (execute != null) {
@@ -117,7 +116,7 @@ public class AdHocCommandDataProvider extends IQProvider<AdHocCommandData> {
                     adHocCommandData.setError(error);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("command")) {
                     done = true;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java
index 280d3d0a2..39a32ec56 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/AbstractDelayInformationProvider.java
@@ -22,12 +22,11 @@ import java.util.Date;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.delay.packet.DelayInformation;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public abstract class AbstractDelayInformationProvider extends ExtensionElementProvider<DelayInformation> {
 
     @Override
@@ -36,23 +35,19 @@ public abstract class AbstractDelayInformationProvider extends ExtensionElementP
                     IOException, SmackTextParseException {
         String stampString = (parser.getAttributeValue("", "stamp"));
         String from = parser.getAttributeValue("", "from");
-        String reason = null;
-        if (!parser.isEmptyElementTag()) {
-            int event = parser.next();
-            switch (event) {
-            case XmlPullParser.TEXT:
-                reason = parser.getText();
-                parser.next();
-                break;
-            case XmlPullParser.END_TAG:
-                reason = "";
-                break;
-            default:
-                // TODO: Should be SmackParseException.
-                throw new IOException("Unexpected event: " + event);
-            }
-        } else {
+        final String reason;
+        XmlPullParser.Event event = parser.next();
+        switch (event) {
+        case TEXT_CHARACTERS:
+            reason = parser.getText();
             parser.next();
+            break;
+        case END_ELEMENT:
+            reason = null;
+            break;
+        default:
+            // TODO: Should be SmackParseException.
+            throw new IOException("Unexpected event: " + event);
         }
 
         Date stamp = parseDate(stampString);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
index c31a45aad..374f8bdbb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java
@@ -25,6 +25,8 @@ import java.util.List;
 import java.util.Set;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.util.EqualsUtil;
+import org.jivesoftware.smack.util.HashCode;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.TypedCloneable;
 import org.jivesoftware.smack.util.XmlStringBuilder;
@@ -397,37 +399,22 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
          */
         @Override
         public boolean equals(Object obj) {
-            if (obj == null)
-                return false;
-            if (obj == this)
-                return true;
-            if (obj.getClass() != getClass())
-                return false;
-
-            DiscoverInfo.Identity other = (DiscoverInfo.Identity) obj;
-            if (!this.key.equals(other.key))
-                return false;
-
-            String otherLang = other.lang == null ? "" : other.lang;
-            String thisLang = lang == null ? "" : lang;
-            if (!otherLang.equals(thisLang))
-                return false;
-
-            String otherName = other.name == null ? "" : other.name;
-            String thisName = name == null ? "" : other.name;
-            if (!thisName.equals(otherName))
-                return false;
-
-            return true;
+            return EqualsUtil.equals(this, obj, (e, o) -> {
+                e.append(key, o.key)
+                 .append(lang, o.lang)
+                 .append(name, o.name);
+            });
         }
 
+        private final HashCode.Cache hashCodeCache = new HashCode.Cache();
+
         @Override
         public int hashCode() {
-            int result = 1;
-            result = 37 * result + key.hashCode();
-            result = 37 * result + (lang == null ? 0 : lang.hashCode());
-            result = 37 * result + (name == null ? 0 : name.hashCode());
-            return result;
+            return hashCodeCache.getHashCode(c ->
+                c.append(key)
+                 .append(lang)
+                 .append(name)
+            );
         }
 
         /**
@@ -522,15 +509,9 @@ public class DiscoverInfo extends IQ implements TypedCloneable<DiscoverInfo> {
 
         @Override
         public boolean equals(Object obj) {
-            if (obj == null)
-                return false;
-            if (obj == this)
-                return true;
-            if (obj.getClass() != getClass())
-                return false;
-
-            DiscoverInfo.Feature other = (DiscoverInfo.Feature) obj;
-            return variable.equals(other.variable);
+            return EqualsUtil.equals(this, obj, (e, o) -> {
+                e.append(variable, o.variable);
+            });
         }
 
         @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
index 9936184a6..824649716 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java
@@ -237,5 +237,10 @@ public class DiscoverItems extends IQ {
             xml.closeEmptyElement();
             return xml;
         }
+
+        @Override
+        public String toString() {
+            return toXML().toString();
+        }
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
index 16d244066..561e41038 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
@@ -23,12 +23,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
 * The DiscoverInfoProvider parses Service Discovery information packets.
 *
@@ -48,8 +47,8 @@ public class DiscoverInfoProvider extends IQProvider<DiscoverInfo> {
         String lang = "";
         discoverInfo.setNode(parser.getAttributeValue("", "node"));
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 final String name = parser.getName();
                 final String namespace = parser.getNamespace();
                 if (namespace.equals(DiscoverInfo.NAMESPACE)) {
@@ -71,7 +70,7 @@ public class DiscoverInfoProvider extends IQProvider<DiscoverInfo> {
                 else {
                     PacketParserUtils.addExtensionElement(discoverInfo, parser, xmlEnvironment);
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("identity")) {
                     // Create a new identity and add it to the discovered info.
                     identity = new DiscoverInfo.Identity(category, type, identityName, lang);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java
index bc9a8f3db..ed687c19d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java
@@ -22,12 +22,12 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
 * The DiscoverInfoProvider parses Service Discovery items packets.
@@ -48,16 +48,16 @@ public class DiscoverItemsProvider extends IQProvider<DiscoverItems> {
         String node = "";
         discoverItems.setNode(parser.getAttributeValue("", "node"));
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG && "item".equals(parser.getName())) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT && "item".equals(parser.getName())) {
                 // Initialize the variables from the parsed XML
                 jid = ParserUtils.getJidAttribute(parser);
                 name = parser.getAttributeValue("", "name");
                 node = parser.getAttributeValue("", "node");
                 action = parser.getAttributeValue("", "action");
             }
-            else if (eventType == XmlPullParser.END_TAG && "item".equals(parser.getName())) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && "item".equals(parser.getName())) {
                 // Create a new Item and add it to DiscoverItems.
                 item = new DiscoverItems.Item(jid);
                 item.setName(name);
@@ -65,7 +65,7 @@ public class DiscoverItemsProvider extends IQProvider<DiscoverItems> {
                 item.setAction(action);
                 discoverItems.addItem(item);
             }
-            else if (eventType == XmlPullParser.END_TAG && "query".equals(parser.getName())) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && "query".equals(parser.getName())) {
                 done = true;
             }
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index 1eeda099e..0d42e230a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -226,7 +226,7 @@ public final class FileTransferNegotiator extends Manager {
         boolean isByteStream = false;
         boolean isIBB = false;
         for (FormField.Option option : field.getOptions()) {
-            variable = option.getValue();
+            variable = option.getValueString();
             if (variable.equals(Bytestream.NAMESPACE) && !IBB_ONLY) {
                 isByteStream = true;
             }
@@ -369,13 +369,15 @@ public final class FileTransferNegotiator extends Manager {
 
     private static DataForm createDefaultInitiationForm() {
         DataForm form = new DataForm(DataForm.Type.form);
-        FormField field = new FormField(STREAM_DATA_FIELD_NAME);
-        field.setType(FormField.Type.list_single);
+        FormField.Builder fieldBuilder = FormField.builder();
+        fieldBuilder.setFieldName(STREAM_DATA_FIELD_NAME)
+        .setType(FormField.Type.list_single);
+
         if (!IBB_ONLY) {
-            field.addOption(new FormField.Option(Bytestream.NAMESPACE));
+            fieldBuilder.addOption(Bytestream.NAMESPACE);
         }
-        field.addOption(new FormField.Option(DataPacketExtension.NAMESPACE));
-        form.addField(field);
+        fieldBuilder.addOption(DataPacketExtension.NAMESPACE);
+        form.addField(fieldBuilder.build());
         return form;
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
index 9bc29ea6a..a29130469 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
@@ -26,6 +26,7 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
index 5537f6f0d..393be25e6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
@@ -81,12 +81,12 @@ public abstract class StreamNegotiator extends Manager {
         response.setStanzaId(streamInitiationOffer.getStanzaId());
 
         DataForm form = new DataForm(DataForm.Type.submit);
-        FormField field = new FormField(
+        FormField.Builder field = FormField.builder(
                 FileTransferNegotiator.STREAM_DATA_FIELD_NAME);
         for (String namespace : namespaces) {
             field.addValue(namespace);
         }
-        form.addField(field);
+        form.addField(field.build());
 
         response.setFeatureNegotiationForm(form);
         return response;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
index 919f0dae5..e8bd8b4fe 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
@@ -25,14 +25,13 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.delay.packet.DelayInformation;
 import org.jivesoftware.smackx.delay.provider.DelayInformationProvider;
 import org.jivesoftware.smackx.forward.packet.Forwarded;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * This class implements the {@link ExtensionElementProvider} to parse
  * forwarded messages from a packet.  It will return a {@link Forwarded} stanza extension.
@@ -51,9 +50,9 @@ public class ForwardedProvider extends ExtensionElementProvider<Forwarded> {
         Stanza packet = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (name) {
@@ -72,11 +71,14 @@ public class ForwardedProvider extends ExtensionElementProvider<Forwarded> {
                     LOGGER.warning("Unsupported forwarded packet type: " + name);
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java
index 2afe22663..1adb99b85 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/GeoLocationManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015-2017 Ishan Khanna, Fernando Ramirez
+ * Copyright 2015-2017 Ishan Khanna, Fernando Ramirez 2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,12 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.Message;
 
 import org.jivesoftware.smackx.geoloc.packet.GeoLocation;
+import org.jivesoftware.smackx.geoloc.provider.GeoLocationProvider;
 import org.jivesoftware.smackx.pubsub.LeafNode;
 import org.jivesoftware.smackx.pubsub.PayloadItem;
 import org.jivesoftware.smackx.pubsub.PubSubException.NotALeafNodeException;
 import org.jivesoftware.smackx.pubsub.PubSubManager;
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProviderManager;
 
 import org.jxmpp.jid.Jid;
 
@@ -41,6 +43,9 @@ public final class GeoLocationManager extends Manager {
     private static final Map<XMPPConnection, GeoLocationManager> INSTANCES = new WeakHashMap<>();
 
     static {
+        FormFieldChildElementProviderManager.addFormFieldChildElementProvider(
+                        GeoLocationProvider.GeoLocationFormFieldChildElementProvider.INSTANCE);
+
         XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
             @Override
             public void connectionCreated(XMPPConnection connection) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
index 3abc3c334..caa25b1fe 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015-2017 Ishan Khanna, Fernando Ramirez
+ * Copyright 2015-2017 Ishan Khanna, Fernando Ramirez, 2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,23 +22,32 @@ import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
+import org.jivesoftware.smackx.xdata.FormField;
+import org.jivesoftware.smackx.xdata.FormFieldChildElement;
+
 /**
  * A GeoLocation Extension packet, which is used by the XMPP clients to exchange their respective geographic locations.
  *
  * @see <a href="http://www.xmpp.org/extensions/xep-0080.html">XEP-0080</a>
  * @author Ishan Khanna
  */
-public final class GeoLocation implements Serializable, ExtensionElement {
+public final class GeoLocation implements Serializable, ExtensionElement, FormFieldChildElement {
 
     private static final long serialVersionUID = 1L;
+
     public static final String NAMESPACE = "http://jabber.org/protocol/geoloc";
+
     public static final String ELEMENT = "geoloc";
 
+    public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
     private static final Logger LOGGER = Logger.getLogger(GeoLocation.class.getName());
 
     private final Double accuracy;
@@ -208,6 +217,11 @@ public final class GeoLocation implements Serializable, ExtensionElement {
         return uri;
     }
 
+    @Override
+    public QName getQName() {
+        return QNAME;
+    }
+
     @Override
     public String getElementName() {
         return ELEMENT;
@@ -254,10 +268,19 @@ public final class GeoLocation implements Serializable, ExtensionElement {
         return new GeoLocation.Builder();
     }
 
+    @Override
+    public boolean isExclusiveElement() {
+        return true;
+    }
+
     public static GeoLocation from(Message message) {
         return message.getExtension(ELEMENT, NAMESPACE);
     }
 
+    public static GeoLocation from(FormField formField) {
+        return (GeoLocation) formField.getFormFieldChildElement(QNAME);
+    }
+
     public static class Builder {
 
         private Double accuracy;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java
index 782c70ac8..cf6234aa4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/provider/GeoLocationProvider.java
@@ -18,19 +18,24 @@ package org.jivesoftware.smackx.geoloc.provider;
 
 import java.io.IOException;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackUriSyntaxParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.geoloc.packet.GeoLocation;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProvider;
 
 public class GeoLocationProvider extends ExtensionElementProvider<GeoLocation> {
 
+    public static final GeoLocationProvider INSTANCE = new GeoLocationProvider();
+
     @Override
     public GeoLocation parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException,
                     SmackTextParseException, SmackUriSyntaxParsingException {
@@ -38,9 +43,9 @@ public class GeoLocationProvider extends ExtensionElementProvider<GeoLocation> {
         GeoLocation.Builder builder = GeoLocation.builder();
 
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "accuracy":
@@ -117,14 +122,35 @@ public class GeoLocationProvider extends ExtensionElementProvider<GeoLocation> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
         return builder.build();
     }
 
+    public static class GeoLocationFormFieldChildElementProvider extends FormFieldChildElementProvider<GeoLocation> {
+
+        public static final GeoLocationFormFieldChildElementProvider INSTANCE = new GeoLocationFormFieldChildElementProvider();
+
+        @Override
+        public QName getQName() {
+            return GeoLocation.QNAME;
+        }
+
+        @Override
+        public GeoLocation parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
+                        throws XmlPullParserException, IOException, SmackParsingException {
+            return GeoLocationProvider.INSTANCE.parse(parser, initialDepth, xmlEnvironment);
+        }
+
+    }
+
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
index ddb067f54..80c4bfc28 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java
@@ -22,10 +22,10 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * A last activity IQ for retrieving information about the last activity associated with a Jabber ID.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
index 792fb6a8f..a4a758e93 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
@@ -18,10 +18,12 @@
 package org.jivesoftware.smackx.iqprivate;
 
 import java.io.IOException;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
@@ -31,16 +33,14 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError.Condition;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iqprivate.packet.DefaultPrivateData;
 import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
 import org.jivesoftware.smackx.iqprivate.packet.PrivateDataIQ;
 import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider;
 
-import org.jxmpp.util.XmppStringUtils;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Manages private data, which is a mechanism to allow users to store arbitrary XML
  * data on an XMPP server. Each private data chunk is defined by a element name and
@@ -77,7 +77,7 @@ public final class PrivateDataManager extends Manager {
     /**
      * Map of provider instances.
      */
-    private static final Map<String, PrivateDataProvider> privateDataProviders = new Hashtable<>();
+    private static final Map<QName, PrivateDataProvider> privateDataProviders = new HashMap<>();
 
     /**
      * Returns the private data provider registered to the specified XML element name and namespace.
@@ -102,7 +102,7 @@ public final class PrivateDataManager extends Manager {
      * @return the PrivateData provider.
      */
     public static PrivateDataProvider getPrivateDataProvider(String elementName, String namespace) {
-        String key = XmppStringUtils.generateKey(elementName, namespace);
+        QName key = new QName(namespace, elementName);
         return privateDataProviders.get(key);
     }
 
@@ -116,7 +116,7 @@ public final class PrivateDataManager extends Manager {
      */
     public static void addPrivateDataProvider(String elementName, String namespace,
             PrivateDataProvider provider) {
-        String key = XmppStringUtils.generateKey(elementName, namespace);
+        QName key = new QName(namespace, elementName);
         privateDataProviders.put(key, provider);
     }
 
@@ -127,7 +127,7 @@ public final class PrivateDataManager extends Manager {
      * @param namespace The XML namespace.
      */
     public static void removePrivateDataProvider(String elementName, String namespace) {
-        String key = XmppStringUtils.generateKey(elementName, namespace);
+        QName key = new QName(namespace, elementName);
         privateDataProviders.remove(key);
     }
 
@@ -241,8 +241,8 @@ public final class PrivateDataManager extends Manager {
             PrivateData privateData = null;
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     String elementName = parser.getName();
                     String namespace = parser.getNamespace();
                     // See if any objects are registered to handle this private data type.
@@ -256,23 +256,20 @@ public final class PrivateDataManager extends Manager {
                         DefaultPrivateData data = new DefaultPrivateData(elementName, namespace);
                         boolean finished = false;
                         while (!finished) {
-                            int event = parser.next();
-                            if (event == XmlPullParser.START_TAG) {
+                            XmlPullParser.Event event = parser.next();
+                            if (event == XmlPullParser.Event.START_ELEMENT) {
                                 String name = parser.getName();
-                                // If an empty element, set the value with the empty string.
-                                if (parser.isEmptyElementTag()) {
-                                    data.setValue(name,"");
+                                event = parser.next();
+                                if (event == XmlPullParser.Event.TEXT_CHARACTERS) {
+                                    String value = parser.getText();
+                                    data.setValue(name, value);
                                 }
-                                // Otherwise, get the the element text.
-                                else {
-                                    event = parser.next();
-                                    if (event == XmlPullParser.TEXT) {
-                                        String value = parser.getText();
-                                        data.setValue(name, value);
-                                    }
+                                else if (event == XmlPullParser.Event.END_ELEMENT) {
+                                    // If an empty element, set the value with the empty string.
+                                    data.setValue(name, "");
                                 }
                             }
-                            else if (event == XmlPullParser.END_TAG) {
+                            else if (event == XmlPullParser.Event.END_ELEMENT) {
                                 if (parser.getName().equals(elementName)) {
                                     finished = true;
                                 }
@@ -281,7 +278,7 @@ public final class PrivateDataManager extends Manager {
                         privateData = data;
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("query")) {
                         done = true;
                     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
index a4332d667..6c8f72d3e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java
@@ -19,10 +19,10 @@ package org.jivesoftware.smackx.iqprivate.provider;
 
 import java.io.IOException;
 
-import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.iqprivate.packet.PrivateData;
 
 /**
  * An interface for parsing custom private data. Each PrivateDataProvider must
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
index defd0cef6..c149e0b14 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
@@ -307,7 +307,7 @@ public final class AccountManager extends Manager {
         }
         Map<String, String> map = new HashMap<>();
         map.put("username",  connection().getUser().getLocalpart().toString());
-        map.put("password",newPassword);
+        map.put("password", newPassword);
         Registration reg = new Registration(map);
         reg.setType(IQ.Type.set);
         reg.setTo(connection().getXMPPServiceDomain());
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java
index ffcd08b7d..33bbed247 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationProvider.java
@@ -28,12 +28,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iqregister.packet.Registration;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class RegistrationProvider extends IQProvider<Registration> {
 
     @Override
@@ -43,15 +42,15 @@ public class RegistrationProvider extends IQProvider<Registration> {
         List<ExtensionElement> packetExtensions = new LinkedList<>();
         outerloop:
         while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 // Any element that's in the jabber:iq:register namespace,
                 // attempt to parse it if it's in the form <name>value</name>.
                 if (parser.getNamespace().equals(Registration.NAMESPACE)) {
                     String name = parser.getName();
                     String value = "";
 
-                    if (parser.next() == XmlPullParser.TEXT) {
+                    if (parser.next() == XmlPullParser.Event.TEXT_CHARACTERS) {
                         value = parser.getText();
                     }
                     // Ignore instructions, but anything else should be added to the map.
@@ -67,7 +66,7 @@ public class RegistrationProvider extends IQProvider<Registration> {
                     PacketParserUtils.addExtensionElement(packetExtensions, parser, xmlEnvironment);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(IQ.QUERY_ELEMENT)) {
                     break outerloop;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java
index 3700b1596..51b5b505b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/provider/RegistrationStreamFeatureProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.iqregister.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.iqregister.packet.Registration;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class RegistrationStreamFeatureProvider extends ExtensionElementProvider<Registration.Feature> {
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java
index 851621777..328cdfccf 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java
@@ -22,12 +22,11 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.iqversion.packet.Version;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class VersionProvider extends IQProvider<Version> {
 
     @Override
@@ -35,9 +34,9 @@ public class VersionProvider extends IQProvider<Version> {
         String name = null, version = null, os = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String tagName = parser.getName();
                 switch (tagName) {
                 case "name":
@@ -51,10 +50,14 @@ public class VersionProvider extends IQProvider<Version> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth && parser.getName().equals(IQ.QUERY_ELEMENT)) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         if (name == null && version == null && os == null) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleHandler.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleHandler.java
index 2322a06ac..b74a1d6e9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleHandler.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleHandler.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.jingle;
 
 import org.jivesoftware.smack.packet.IQ;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 
 public interface JingleHandler {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
index 5f74e70a3..71efc73e6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
@@ -31,6 +31,7 @@ import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.util.StringUtils;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleAction;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
index 1ae4ac650..db402c7ea 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
@@ -23,6 +23,9 @@ import java.util.concurrent.Future;
 
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.util.EqualsUtil;
+import org.jivesoftware.smack.util.HashCode;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
 import org.jivesoftware.smackx.jingle.transports.JingleTransportSession;
@@ -111,22 +114,20 @@ public abstract class JingleSession implements JingleSessionHandler {
 
     @Override
     public int hashCode() {
-        int hashCode = 31 + getInitiator().hashCode();
-        hashCode = 31 * hashCode + getResponder().hashCode();
-        hashCode = 31 * hashCode + getSessionId().hashCode();
-        return hashCode;
+        return HashCode.builder()
+                       .append(getInitiator())
+                       .append(getResponder())
+                       .append(getSessionId())
+                       .build();
     }
 
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof JingleSession)) {
-            return false;
-        }
-
-        JingleSession otherJingleSession = (JingleSession) other;
-        return getInitiator().equals(otherJingleSession.getInitiator())
-                && getResponder().equals(otherJingleSession.getResponder())
-                && sid.equals(otherJingleSession.sid);
+        return EqualsUtil.equals(this, other, (e, o) ->
+            e.append(getInitiator(), o.getInitiator())
+              .append(getResponder(), o.getResponder())
+              .append(sid, o.sid)
+        );
     }
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionHandler.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionHandler.java
index a57ede3ff..b20ddfede 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionHandler.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionHandler.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.jingle;
 
 import org.jivesoftware.smack.packet.IQ;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 
 public interface JingleSessionHandler {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportMethodManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportMethodManager.java
index 9a9941a07..661abbe0f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportMethodManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleTransportMethodManager.java
@@ -23,6 +23,7 @@ import java.util.WeakHashMap;
 
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.XMPPConnection;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
 import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleUtil.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleUtil.java
index e2292ee0b..4e5c6eddf 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleUtil.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleUtil.java
@@ -21,6 +21,7 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleAction;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
index f4e348e77..fd4da5c19 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
@@ -21,12 +21,11 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingle.element.JingleContentDescription;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public abstract class JingleContentDescriptionProvider<D extends JingleContentDescription>
                 extends ExtensionElementProvider<D> {
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java
index 249ec52d9..11d2df73b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentTransportProvider.java
@@ -20,12 +20,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public abstract class JingleContentTransportProvider<T extends JingleContentTransport>
                 extends ExtensionElementProvider<T> {
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java
index c588e4f61..f6b052bcb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleErrorProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.jingle.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.jingle.element.JingleError;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class JingleErrorProvider extends ExtensionElementProvider<JingleError> {
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
index 0d7a4e46e..8ff1e269b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
@@ -25,6 +25,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.StandardExtensionElementProvider;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleAction;
@@ -37,8 +39,6 @@ import org.jivesoftware.smackx.jingle.element.UnknownJingleContentDescription;
 import org.jivesoftware.smackx.jingle.element.UnknownJingleContentTransport;
 
 import org.jxmpp.jid.FullJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class JingleProvider extends IQProvider<Jingle> {
 
@@ -65,9 +65,9 @@ public class JingleProvider extends IQProvider<Jingle> {
 
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String tagName = parser.getName();
                 switch (tagName) {
                 case JingleContent.ELEMENT:
@@ -92,10 +92,14 @@ public class JingleProvider extends IQProvider<Jingle> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
@@ -123,9 +127,9 @@ public class JingleProvider extends IQProvider<Jingle> {
         }
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String tagName = parser.getName();
                 String namespace = parser.getNamespace();
                 switch (tagName) {
@@ -160,10 +164,14 @@ public class JingleProvider extends IQProvider<Jingle> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportManager.java
index 96fd3b54a..bfc0d1a5d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportManager.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.jingle.transports;
 
 import org.jivesoftware.smack.AbstractConnectionListener;
 import org.jivesoftware.smack.XMPPConnection;
+
 import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportSession.java
index 004379f8e..a90fb020f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/JingleTransportSession.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.jingle.transports;
 
 import org.jivesoftware.smack.packet.IQ;
+
 import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportManager.java
index 63dada1ae..ccc30f80d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportManager.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.jingle.transports.jingle_ibb;
 import java.util.WeakHashMap;
 
 import org.jivesoftware.smack.XMPPConnection;
+
 import org.jivesoftware.smackx.jingle.JingleSession;
 import org.jivesoftware.smackx.jingle.provider.JingleContentProviderManager;
 import org.jivesoftware.smackx.jingle.transports.JingleTransportManager;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportSession.java
index 1254f33b4..87ca1fd13 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportSession.java
@@ -22,6 +22,7 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
+
 import org.jivesoftware.smackx.bytestreams.BytestreamListener;
 import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
 import org.jivesoftware.smackx.bytestreams.BytestreamSession;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java
index c45bc46f0..061ac0b0e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/provider/JingleIBBTransportProvider.java
@@ -17,11 +17,11 @@
 package org.jivesoftware.smackx.jingle.transports.jingle_ibb.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.jingle.provider.JingleContentTransportProvider;
 import org.jivesoftware.smackx.jingle.transports.jingle_ibb.element.JingleIBBTransport;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Parse JingleByteStreamTransport elements.
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java
index 52c4289a6..60b1e9f88 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportManager.java
@@ -27,6 +27,7 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
+
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
index 578f2ae22..df1641df7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.jingle.transports.jingle_s5b;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.Socket;
 import java.util.Collections;
 import java.util.List;
@@ -27,6 +28,7 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
+
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
 import org.jivesoftware.smackx.bytestreams.socks5.Socks5ClientForInitiator;
@@ -161,7 +163,7 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
     private UsedCandidate connectToTheirCandidate(JingleS5BTransportCandidate candidate)
             throws InterruptedException, TimeoutException, SmackException, XMPPException, IOException {
         Bytestream.StreamHost streamHost = candidate.getStreamHost();
-        String address = streamHost.getAddress();
+        InetAddress address = streamHost.getAddress().asInetAddress();
         Socks5Client socks5Client = new Socks5Client(streamHost, theirProposal.getDestinationAddress());
         Socket socket = socks5Client.getSocket(10 * 1000);
         LOGGER.log(Level.INFO, "Connected to their StreamHost " + address + " using dstAddr "
@@ -172,7 +174,7 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
     private UsedCandidate connectToOurCandidate(JingleS5BTransportCandidate candidate)
             throws InterruptedException, TimeoutException, SmackException, XMPPException, IOException {
         Bytestream.StreamHost streamHost = candidate.getStreamHost();
-        String address = streamHost.getAddress();
+        InetAddress address = streamHost.getAddress().asInetAddress();
         Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(
                 streamHost, ourProposal.getDestinationAddress(), jingleSession.getConnection(),
                 ourProposal.getStreamId(), jingleSession.getRemote());
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransport.java
index 407b6ad88..18d58639e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransport.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransport.java
@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
 import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidate;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java
index 67f5562ee..1947fec41 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java
@@ -16,11 +16,11 @@
  */
 package org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements;
 
-import java.util.logging.Logger;
-
+import org.jivesoftware.smack.util.InternetAddress;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidate;
 
@@ -33,8 +33,6 @@ import org.jxmpp.stringprep.XmppStringprepException;
  */
 public final class JingleS5BTransportCandidate extends JingleContentTransportCandidate {
 
-    private static final Logger LOGGER = Logger.getLogger(JingleS5BTransportCandidate.class.getName());
-
     public static final String ATTR_CID = "cid";
     public static final String ATTR_HOST = "host";
     public static final String ATTR_JID = "jid";
@@ -43,14 +41,17 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
     public static final String ATTR_TYPE = "type";
 
     private final String cid;
-    private final String host;
+    private final InternetAddress host;
     private final Jid jid;
     private final int port;
     private final int priority;
     private final Type type;
 
-    public JingleS5BTransportCandidate(String candidateId, String host, Jid jid, int port, int priority, Type type) {
+    public JingleS5BTransportCandidate(String candidateId, String hostString, Jid jid, int port, int priority, Type type) {
+        this(candidateId, InternetAddress.from(hostString), jid, port, priority, type);
+    }
 
+    public JingleS5BTransportCandidate(String candidateId, InternetAddress host, Jid jid, int port, int priority, Type type) {
         Objects.requireNonNull(candidateId);
         Objects.requireNonNull(host);
         Objects.requireNonNull(jid);
@@ -105,7 +106,7 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
         return cid;
     }
 
-    public String getHost() {
+    public InternetAddress getHost() {
         return host;
     }
 
@@ -152,7 +153,7 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
 
     public static final class Builder {
         private String cid;
-        private String host;
+        private InternetAddress host;
         private Jid jid;
         private int port = -1;
         private int priority = -1;
@@ -166,7 +167,12 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
             return this;
         }
 
-        public Builder setHost(String host) {
+        public Builder setHost(String host)  {
+            InternetAddress inetAddress = InternetAddress.from(host);
+            return setHost(inetAddress);
+        }
+
+        public Builder setHost(InternetAddress host) {
             this.host = host;
             return this;
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java
index 8ca592144..e21cd77bf 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements;
 
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfo;
 
 /**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/provider/JingleS5BTransportProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/provider/JingleS5BTransportProvider.java
index 943be425e..153fee447 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/provider/JingleS5BTransportProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/provider/JingleS5BTransportProvider.java
@@ -24,12 +24,13 @@ import static org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.Jing
 import static org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransportCandidate.ATTR_PORT;
 import static org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransportCandidate.ATTR_PRIORITY;
 import static org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransportCandidate.ATTR_TYPE;
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
 
 import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
 import org.jivesoftware.smackx.jingle.provider.JingleContentTransportProvider;
 import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransport;
@@ -37,9 +38,6 @@ import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTr
 import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransportInfo;
 import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransportInfo.JingleS5BCandidateTransportInfo;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Provider for JingleSocks5BytestreamTransport elements.
  */
@@ -62,10 +60,10 @@ public class JingleS5BTransportProvider extends JingleContentTransportProvider<J
 
         JingleS5BTransportCandidate.Builder cb;
         outerloop: while (true) {
-            int tag = parser.nextTag();
+            XmlPullParser.TagEvent tag = parser.nextTag();
             String name = parser.getName();
             switch (tag) {
-                case START_TAG: {
+                case START_ELEMENT: {
                     switch (name) {
 
                         case JingleS5BTransportCandidate.ELEMENT:
@@ -110,12 +108,13 @@ public class JingleS5BTransportProvider extends JingleContentTransportProvider<J
                 }
                 break;
 
-                case END_TAG: {
+                case END_ELEMENT: {
                     switch (name) {
                         case JingleContentTransport.ELEMENT:
                             break outerloop;
                     }
                 }
+                    break;
             }
         }
         return builder.build();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
index ff28a583f..1e3eb2a91 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
@@ -27,13 +27,12 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jiveproperties.JivePropertiesManager;
 import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class JivePropertiesExtensionProvider extends ExtensionElementProvider<JivePropertiesExtension> {
 
     private static final Logger LOGGER = Logger.getLogger(JivePropertiesExtensionProvider.class.getName());
@@ -58,8 +57,8 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
                     IOException {
         Map<String, Object> properties = new HashMap<>();
         while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG && parser.getName().equals("property")) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getName().equals("property")) {
                 // Parse a property
                 boolean done = false;
                 String name = null;
@@ -68,7 +67,7 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
                 Object value = null;
                 while (!done) {
                     eventType = parser.next();
-                    if (eventType == XmlPullParser.START_TAG) {
+                    if (eventType == XmlPullParser.Event.START_ELEMENT) {
                         String elementName = parser.getName();
                         if (elementName.equals("name")) {
                             name = parser.nextText();
@@ -78,7 +77,7 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
                             valueText = parser.nextText();
                         }
                     }
-                    else if (eventType == XmlPullParser.END_TAG) {
+                    else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                         if (parser.getName().equals("property")) {
                             if ("integer".equals(type)) {
                                 value = Integer.valueOf(valueText);
@@ -124,7 +123,7 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider<Ji
                     }
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(JivePropertiesExtension.ELEMENT)) {
                     break;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/provider/IdleProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/provider/IdleProvider.java
index 53bf305b9..156294799 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/provider/IdleProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/provider/IdleProvider.java
@@ -23,10 +23,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.last_interaction.element.IdleElement;
 
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IdleProvider extends ExtensionElementProvider<IdleElement> {
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/MediaElementManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/MediaElementManager.java
new file mode 100644
index 000000000..aa2596227
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/MediaElementManager.java
@@ -0,0 +1,27 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.mediaelement;
+
+import org.jivesoftware.smackx.mediaelement.provider.MediaElementProvider;
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProviderManager;
+
+public class MediaElementManager {
+
+    static {
+        FormFieldChildElementProviderManager.addFormFieldChildElementProvider(new MediaElementProvider());
+    }
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/MediaElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/MediaElement.java
new file mode 100644
index 000000000..b831933e5
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/MediaElement.java
@@ -0,0 +1,180 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.mediaelement.element;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.datatypes.UInt16;
+import org.jivesoftware.smack.packet.FullyQualifiedElement;
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.util.Objects;
+import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.util.XmlStringBuilder;
+
+import org.jivesoftware.smackx.xdata.FormField;
+import org.jivesoftware.smackx.xdata.FormFieldChildElement;
+
+public class MediaElement implements FormFieldChildElement {
+
+    public static final String ELEMENT = "media";
+
+    public static final String NAMESPACE = "urn:xmpp:media-element";
+
+    public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
+    private final UInt16 height;
+
+    private final UInt16 width;
+
+    private final List<Uri> uris;
+
+    public MediaElement(Builder builder) {
+        this.height = builder.height;
+        this.width = builder.width;
+        this.uris = Collections.unmodifiableList(builder.uris);
+    }
+
+    public UInt16 getHeight() {
+        return height;
+    }
+
+    public UInt16 getWidth() {
+        return width;
+    }
+
+    public List<Uri> getUris() {
+        return uris;
+    }
+
+    @Override
+    public String getElementName() {
+        return ELEMENT;
+    }
+
+    @Override
+    public String getNamespace() {
+        return NAMESPACE;
+    }
+
+    @Override
+    public QName getQName() {
+        return QNAME;
+    }
+
+    @Override
+    public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
+        XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
+        xml.optAttribute("height", height)
+            .optAttribute("width", width)
+            .rightAngleBracket();
+
+        xml.append(uris, xmlEnvironment);
+
+        xml.closeElement(this);
+        return null;
+    }
+
+    public MediaElement from(FormField formField) {
+        return (MediaElement) formField.getFormFieldChildElement(QNAME);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private UInt16 height, width;
+
+        private List<Uri> uris = new ArrayList<>();
+
+        public Builder setHeightAndWidth(int height, int width) {
+            return setHeightAndWidth(UInt16.from(height), UInt16.from(width));
+        }
+
+        public Builder setHeightAndWidth(UInt16 height, UInt16 width) {
+            this.height = height;
+            this.width = width;
+            return this;
+        }
+
+        public Builder addUri(URI uri, String type) {
+            return addUri(new Uri(uri, type));
+        }
+
+        public Builder addUri(Uri uri) {
+            uris.add(uri);
+            return this;
+        }
+
+        public MediaElement build() {
+            return new MediaElement(this);
+        }
+    }
+
+    public static final class Uri implements FullyQualifiedElement {
+        public static final String ELEMENT = "uri";
+
+        public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
+        private final URI uri;
+        private final String type;
+
+        public Uri(URI uri, String type) {
+            this.uri = Objects.requireNonNull(uri);
+            this.type = StringUtils.requireNotNullNorEmpty(type, "The 'type' argument must not be null or empty");
+        }
+
+        public URI getUri() {
+            return uri;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public QName getQName() {
+            return QNAME;
+        }
+
+        @Override
+        public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
+            XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
+            xml.attribute("type", type)
+               .rightAngleBracket();
+            xml.escape(uri.toString());
+            xml.closeElement(this);
+            return xml;
+        }
+
+    }
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/package-info.java
new file mode 100644
index 000000000..1c6c172fb
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/element/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Element classes for XEP-0221: Data Forms Media Element.
+ */
+package org.jivesoftware.smackx.mediaelement.element;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/package-info.java
new file mode 100644
index 000000000..c0fa98631
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smacks implementation of XEP-0221: Data Forms Media Element.
+ */
+package org.jivesoftware.smackx.mediaelement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java
new file mode 100644
index 000000000..c4b8616b5
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProvider.java
@@ -0,0 +1,83 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.mediaelement.provider;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.datatypes.UInt16;
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.parsing.SmackParsingException.SmackUriSyntaxParsingException;
+import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.mediaelement.element.MediaElement;
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProvider;
+
+public class MediaElementProvider extends FormFieldChildElementProvider<MediaElement> {
+
+    private static final Logger LOGGER = Logger.getLogger(MediaElementProvider.class.getName());
+
+    @Override
+    public QName getQName() {
+        return MediaElement.QNAME;
+    }
+
+    @Override
+    public MediaElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws IOException, XmlPullParserException, SmackUriSyntaxParsingException {
+        UInt16 height = ParserUtils.getUInt16Attribute(parser, "height");
+        UInt16 width = ParserUtils.getUInt16Attribute(parser, "width");
+
+        MediaElement.Builder mediaElementBuilder = MediaElement.builder();
+        if (height != null && width != null) {
+            mediaElementBuilder.setHeightAndWidth(height, width);
+        } else if (height != null || width != null) {
+            LOGGER.warning("Only one of height and width set while parsing media element");
+        }
+
+        outerloop: while (true) {
+            XmlPullParser.TagEvent event = parser.nextTag();
+            switch (event) {
+            case START_ELEMENT:
+                QName qname = parser.getQName();
+                if (qname.equals(MediaElement.Uri.QNAME)) {
+                    MediaElement.Uri uri = parseUri(parser);
+                    mediaElementBuilder.addUri(uri);
+                }
+                break;
+            case END_ELEMENT:
+                if (parser.getDepth() == initialDepth) {
+                    break outerloop;
+                }
+                break;
+            }
+        }
+
+        return mediaElementBuilder.build();
+    }
+
+    private MediaElement.Uri parseUri(XmlPullParser parser)
+                    throws SmackUriSyntaxParsingException, XmlPullParserException, IOException {
+        String type = parser.getAttributeValue("type");
+        URI uri = ParserUtils.getUriFromNextText(parser);
+        return new MediaElement.Uri(uri, type);
+    }
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/package-info.java
new file mode 100644
index 000000000..9b24fd9dc
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mediaelement/provider/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Provider classes for XEP-0221: Data Forms Media Element.
+ */
+package org.jivesoftware.smackx.mediaelement.provider;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java
index da79bd948..ce7366447 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/provider/MessageCorrectProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.message_correct.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.message_correct.element.MessageCorrectExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * A ExtensionElementProvider for the MessageCorrectExtension. As
  * MessageCorrection elements have only the ID of the message to replace.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodListener.java
index 2abe9af10..cc644bd07 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.mood;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.mood.element.MoodElement;
 
 import org.jxmpp.jid.BareJid;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java
index d8cdd1678..a341bffcc 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/MoodManager.java
@@ -28,6 +28,7 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.provider.ProviderManager;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.mood.element.MoodConcretisation;
 import org.jivesoftware.smackx.mood.element.MoodElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/element/MoodElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/element/MoodElement.java
index 5db5f4784..192865faf 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/element/MoodElement.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/element/MoodElement.java
@@ -21,6 +21,7 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.mood.Mood;
 
 /**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodConcretisationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodConcretisationProvider.java
index 42632a639..dfcedfef3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodConcretisationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodConcretisationProvider.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-import org.jivesoftware.smackx.mood.element.MoodConcretisation;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.mood.element.MoodConcretisation;
 
 public abstract class MoodConcretisationProvider<C extends MoodConcretisation> extends ExtensionElementProvider<C> {
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java
index 3f3158e65..c9814b091 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/MoodProvider.java
@@ -16,9 +16,6 @@
  */
 package org.jivesoftware.smackx.mood.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -27,13 +24,13 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.mood.Mood;
 import org.jivesoftware.smackx.mood.element.MoodConcretisation;
 import org.jivesoftware.smackx.mood.element.MoodElement;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class MoodProvider extends ExtensionElementProvider<MoodElement> {
 
     private static final Logger LOGGER = Logger.getLogger(MoodProvider.class.getName());
@@ -47,12 +44,12 @@ public class MoodProvider extends ExtensionElementProvider<MoodElement> {
         MoodConcretisation concretisation = null;
 
         outerloop: while (true) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
             String namespace = parser.getNamespace();
 
             switch (tag) {
-                case START_TAG:
+                case START_ELEMENT:
                     if (MoodElement.ELEM_TEXT.equals(name)) {
                         text = parser.nextText();
                         continue outerloop;
@@ -76,12 +73,17 @@ public class MoodProvider extends ExtensionElementProvider<MoodElement> {
                         throw new XmlPullParserException("Unknown mood value: " + name + " encountered.");
                     }
 
-                case END_TAG:
+                case END_ELEMENT:
                     if (MoodElement.ELEMENT.equals(name)) {
                         MoodElement.MoodSubjectElement subjectElement = (mood == null && concretisation == null) ?
                                 null : new MoodElement.MoodSubjectElement(mood, concretisation);
                         return new MoodElement(subjectElement, text);
                     }
+                    break;
+
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/SimpleMoodConcretisationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/SimpleMoodConcretisationProvider.java
index 1fd7d40a4..bc59b24ea 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/SimpleMoodConcretisationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/mood/provider/SimpleMoodConcretisationProvider.java
@@ -19,10 +19,10 @@ package org.jivesoftware.smackx.mood.provider;
 import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
-import org.jivesoftware.smackx.mood.element.MoodConcretisation;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.mood.element.MoodConcretisation;
 
 /**
  * Simple {@link MoodConcretisationProvider} implementation, suitable for really simple {@link MoodConcretisation}s,
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/AutoJoinSuccessCallback.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/AutoJoinSuccessCallback.java
new file mode 100644
index 000000000..87bc0b19f
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/AutoJoinSuccessCallback.java
@@ -0,0 +1,31 @@
+/**
+ *
+ * Copyright 2019 Vincent Lau
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.muc;
+
+import org.jxmpp.jid.parts.Resourcepart;
+
+public interface AutoJoinSuccessCallback {
+
+    /**
+     * Invoked after the automatic rejoin rooms on reconnect success.
+     *
+     * @param muc the joined MultiUserChat.
+     * @param nickname nickname used by participant to join the room.
+     */
+    void autoJoinSuccess(MultiUserChat muc, Resourcepart nickname);
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index fd6457964..f593a2e90 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -1212,14 +1212,14 @@ public class MultiUserChat {
      */
     public void requestVoice() throws NotConnectedException, InterruptedException {
         DataForm form = new DataForm(DataForm.Type.submit);
-        FormField formTypeField = new FormField(FormField.FORM_TYPE);
+        FormField.Builder formTypeField = FormField.builder(FormField.FORM_TYPE);
         formTypeField.addValue(MUCInitialPresence.NAMESPACE + "#request");
-        form.addField(formTypeField);
-        FormField requestVoiceField = new FormField("muc#role");
+        form.addField(formTypeField.build());
+        FormField.Builder requestVoiceField = FormField.builder("muc#role");
         requestVoiceField.setType(FormField.Type.text_single);
         requestVoiceField.setLabel("Requested role");
         requestVoiceField.addValue("participant");
-        form.addField(requestVoiceField);
+        form.addField(requestVoiceField.build());
         Message message = new Message(room);
         message.addExtension(form);
         connection.sendStanza(message);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java
index c5225f062..a24ae74fe 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java
@@ -153,6 +153,8 @@ public final class MultiUserChatManager extends Manager {
 
     private AutoJoinFailedCallback autoJoinFailedCallback;
 
+    private AutoJoinSuccessCallback autoJoinSuccessCallback;
+
     private final ServiceDiscoveryManager serviceDiscoveryManager;
 
     private MultiUserChatManager(XMPPConnection connection) {
@@ -201,6 +203,7 @@ public final class MultiUserChatManager extends Manager {
                     @Override
                     public void run() {
                         final AutoJoinFailedCallback failedCallback = autoJoinFailedCallback;
+                        final AutoJoinSuccessCallback successCallback = autoJoinSuccessCallback;
                         for (EntityBareJid mucJid : mucs) {
                             MultiUserChat muc = getMultiUserChat(mucJid);
 
@@ -222,6 +225,9 @@ public final class MultiUserChatManager extends Manager {
                             }
                             try {
                                 muc.join(nickname);
+                                if (successCallback != null) {
+                                    successCallback.autoJoinSuccess(muc, nickname);
+                                }
                             } catch (NotAMucServiceException | NoResponseException | XMPPErrorException
                                     | NotConnectedException | InterruptedException e) {
                                 if (failedCallback != null) {
@@ -471,7 +477,7 @@ public final class MultiUserChatManager extends Manager {
 
     /**
      * Set a callback invoked by this manager when automatic join on reconnect failed. If failedCallback is not
-     * <code>null</code>,then automatic rejoin get also enabled.
+     * <code>null</code>, then automatic rejoin get also enabled.
      *
      * @param failedCallback the callback.
      */
@@ -482,6 +488,21 @@ public final class MultiUserChatManager extends Manager {
         }
     }
 
+    /**
+     * Set a callback invoked by this manager when automatic join on reconnect success.
+     * If successCallback is not <code>null</code>, automatic rejoin will also
+     * be enabled.
+     *
+     * @param successCallback the callback
+     */
+    public void setAutoJoinSuccessCallback(AutoJoinSuccessCallback successCallback) {
+        autoJoinSuccessCallback = successCallback;
+        if (successCallback != null) {
+            setAutoJoinOnReconnect(true);
+        }
+    }
+
+
     void addJoinedRoom(EntityBareJid room) {
         joinedRooms.add(room);
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
index 12f882adc..6d870ba17 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
@@ -24,9 +24,8 @@ import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.XmlStringBuilder;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * A group chat invitation stanza extension, which is used to invite other
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java
index 7e3671772..615a21589 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java
@@ -21,12 +21,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muc.packet.MUCAdmin;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * The MUCAdminProvider parses MUCAdmin packets. (@see MUCAdmin)
  *
@@ -40,13 +39,13 @@ public class MUCAdminProvider extends IQProvider<MUCAdmin> {
         MUCAdmin mucAdmin = new MUCAdmin();
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("item")) {
                     mucAdmin.addItem(MUCParserUtils.parseItem(parser));
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("query")) {
                     done = true;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java
index df58a271b..4acdbd5f6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java
@@ -23,12 +23,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muc.packet.MUCOwner;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * The MUCOwnerProvider parses MUCOwner packets. (@see MUCOwner)
  *
@@ -41,8 +40,8 @@ public class MUCOwnerProvider extends IQProvider<MUCOwner> {
         MUCOwner mucOwner = new MUCOwner();
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("item")) {
                     mucOwner.addItem(MUCParserUtils.parseItem(parser));
                 }
@@ -54,7 +53,7 @@ public class MUCOwnerProvider extends IQProvider<MUCOwner> {
                     PacketParserUtils.addExtensionElement(mucOwner, parser, xmlEnvironment);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("query")) {
                     done = true;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java
index 4dff7f255..897fc131b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCParserUtils.java
@@ -19,6 +19,8 @@ package org.jivesoftware.smackx.muc.provider;
 import java.io.IOException;
 
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muc.MUCAffiliation;
 import org.jivesoftware.smackx.muc.MUCRole;
@@ -28,8 +30,6 @@ import org.jivesoftware.smackx.muc.packet.MUCItem;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.parts.Resourcepart;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class MUCParserUtils {
     public static MUCItem parseItem(XmlPullParser parser) throws XmlPullParserException, IOException {
@@ -42,9 +42,9 @@ public class MUCParserUtils {
         Resourcepart actorNick = null;
         String reason = null;
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "actor":
@@ -62,11 +62,14 @@ public class MUCParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new MUCItem(affiliation, role, actor, reason, jid, nick, actorNick);
@@ -77,9 +80,9 @@ public class MUCParserUtils {
         final EntityBareJid jid = ParserUtils.getBareJidAttribute(parser);
         String reason = null;
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 final String name = parser.getName();
                 switch (name) {
                 case "reason":
@@ -87,11 +90,14 @@ public class MUCParserUtils {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (initialDepth == parser.getDepth()) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new Destroy(jid, reason);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
index c702f00c0..d96f1fc42 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
@@ -22,13 +22,13 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.muc.packet.MUCUser;
 
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * The MUCUserProvider parses packets with extended presence information about
@@ -51,7 +51,7 @@ public class MUCUserProvider extends ExtensionElementProvider<MUCUser> {
         MUCUser mucUser = new MUCUser();
         outerloop: while (true) {
             switch (parser.next()) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (parser.getName()) {
                 case "invite":
                     mucUser.setInvite(parseInvite(parser));
@@ -74,11 +74,14 @@ public class MUCUserProvider extends ExtensionElementProvider<MUCUser> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
 
@@ -91,13 +94,13 @@ public class MUCUserProvider extends ExtensionElementProvider<MUCUser> {
         EntityJid from = ParserUtils.getEntityJidAttribute(parser, "from");
 
         outerloop: while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("reason")) {
                     reason = parser.nextText();
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("invite")) {
                     break outerloop;
                 }
@@ -112,13 +115,13 @@ public class MUCUserProvider extends ExtensionElementProvider<MUCUser> {
         EntityBareJid from = ParserUtils.getBareJidAttribute(parser, "from");
 
         outerloop: while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("reason")) {
                     reason = parser.nextText();
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("decline")) {
                     break outerloop;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/provider/NickProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/provider/NickProvider.java
index 495ba586b..0a46d91d4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/provider/NickProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/provider/NickProvider.java
@@ -20,12 +20,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.nick.packet.Nick;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class NickProvider extends ExtensionElementProvider<Nick> {
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
index f1b866bc8..0bbb078ba 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
@@ -22,9 +22,8 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * OfflineMessageInfo is an extension included in the retrieved offline messages requested by
@@ -110,11 +109,11 @@ public class OfflineMessageInfo implements ExtensionElement {
             OfflineMessageInfo info = new OfflineMessageInfo();
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("item"))
                         info.setNode(parser.getAttributeValue("", "node"));
-                } else if (eventType == XmlPullParser.END_TAG) {
+                } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("offline")) {
                         done = true;
                     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
index 889c3563b..f534f7d62 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java
@@ -25,9 +25,8 @@ import java.util.List;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * Represents a request to get some or all the offline messages of a user. This class can also
@@ -205,8 +204,8 @@ public class OfflineMessageRequest extends IQ {
             OfflineMessageRequest request = new OfflineMessageRequest();
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("item")) {
                         request.addItem(parseItem(parser));
                     }
@@ -216,7 +215,7 @@ public class OfflineMessageRequest extends IQ {
                     else if (parser.getName().equals("fetch")) {
                         request.setFetch(true);
                     }
-                } else if (eventType == XmlPullParser.END_TAG) {
+                } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("offline")) {
                         done = true;
                     }
@@ -233,8 +232,8 @@ public class OfflineMessageRequest extends IQ {
             item.setAction(parser.getAttributeValue("", "action"));
             item.setJid(parser.getAttributeValue("", "jid"));
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.END_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("item")) {
                         done = true;
                     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java
index 9086720d0..6e032bf2e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java
@@ -20,12 +20,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.ping.packet.Ping;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class PingProvider extends IQProvider<Ping> {
 
     @Override
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
index bbabb9f58..d25baec53 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.jivesoftware.smack.datatypes.UInt32;
 import org.jivesoftware.smack.packet.IQ;
 
 /**
@@ -147,6 +148,10 @@ public class Privacy extends IQ {
         return this.getItemLists().get(listName);
     }
 
+    public PrivacyItem getItem(String listName, int order) {
+        return getItem(listName, UInt32.from(order));
+    }
+
     /**
      * Returns the privacy item in the specified order.
      *
@@ -154,13 +159,13 @@ public class Privacy extends IQ {
      * @param order the order of the element.
      * @return a List with {@link PrivacyItem}
      */
-    public PrivacyItem getItem(String listName, int order) {
+    public PrivacyItem getItem(String listName, UInt32 order) {
         // CHECKSTYLE:OFF
         Iterator<PrivacyItem> values = getPrivacyList(listName).iterator();
         PrivacyItem itemFound = null;
         while (itemFound == null && values.hasNext()) {
             PrivacyItem element = values.next();
-            if (element.getOrder() == order) {
+            if (element.getOrder().equals(order)) {
                 itemFound = element;
             }
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
index fa984902d..c977fdaf3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
@@ -16,7 +16,9 @@
  */
 package org.jivesoftware.smackx.privacy.packet;
 
-import org.jivesoftware.smack.util.NumberUtil;
+import java.util.Objects;
+
+import org.jivesoftware.smack.datatypes.UInt32;
 
 /**
  * A privacy item acts a rule that when matched defines if a stanza should be blocked or not.
@@ -46,7 +48,7 @@ public class PrivacyItem {
     /**
      * order is a unsigned 32-bit integer that is unique among all items in the list.
      **/
-    private final long order;
+    private final UInt32 order;
 
     /**
      * Type defines if the rule is based on JIDs, roster groups or presence subscription types.
@@ -72,6 +74,10 @@ public class PrivacyItem {
     /** blocks outgoing presence notifications. */
     private boolean filterPresenceOut = false;
 
+    public PrivacyItem(boolean allow, long order) {
+        this(null, null, allow, UInt32.from(order));
+    }
+
     /**
      * Creates a new fall-through privacy item.
      *
@@ -80,10 +86,14 @@ public class PrivacyItem {
      * @param allow true if this is an allow item
      * @param order the order of this privacy item
      */
-    public PrivacyItem(boolean allow, long order) {
+    public PrivacyItem(boolean allow, UInt32 order) {
         this(null, null, allow, order);
     }
 
+    public PrivacyItem(Type type, String value, boolean allow, long order) {
+        this(type, value, allow, UInt32.from(order));
+    }
+
     /**
      * Creates a new privacy item.
      *
@@ -98,12 +108,11 @@ public class PrivacyItem {
      * @param allow true if this is an allow item
      * @param order the order of this privacy item
      */
-    public PrivacyItem(Type type, String value, boolean allow, long order) {
-        NumberUtil.checkIfInUInt32Range(order);
+    public PrivacyItem(Type type, String value, boolean allow, UInt32 order) {
         this.type = type;
         this.value = value;
         this.allow = allow;
-        this.order = order;
+        this.order = Objects.requireNonNull(order);
     }
 
     /**
@@ -131,10 +140,8 @@ public class PrivacyItem {
      * @return the allow communication status.
      */
     public boolean isAllow() {
-    // CHECKSTYLE:OFF
-		return allow;
-	}
-    // CHECKSTYLE:ON
+        return allow;
+    }
 
     /**
      * Returns whether the receiver allow or deny incoming IQ stanzas or not.
@@ -142,10 +149,8 @@ public class PrivacyItem {
      * @return the iq filtering status.
      */
     public boolean isFilterIQ() {
-    // CHECKSTYLE:OFF
-		return filterIQ;
-	}
-    // CHECKSTYLE:ON
+        return filterIQ;
+    }
 
     /**
      * Sets whether the receiver allows or denies incoming IQ stanzas or not.
@@ -153,11 +158,8 @@ public class PrivacyItem {
      * @param filterIQ indicates if the receiver allows or denies incoming IQ stanzas.
      */
     public void setFilterIQ(boolean filterIQ) {
-    // CHECKSTYLE:OFF
-
-		this.filterIQ = filterIQ;
-	}
-    // CHECKSTYLE:ON
+        this.filterIQ = filterIQ;
+    }
 
     /**
      * Returns whether the receiver allows or denies incoming messages or not.
@@ -165,10 +167,8 @@ public class PrivacyItem {
      * @return the message filtering status.
      */
     public boolean isFilterMessage() {
-        // CHECKSTYLE:OFF
-		return filterMessage;
-	}
-    // CHECKSTYLE:ON
+        return filterMessage;
+    }
 
     /**
      * Sets wheather the receiver allows or denies incoming messages or not.
@@ -176,10 +176,8 @@ public class PrivacyItem {
      * @param filterMessage indicates if the receiver allows or denies incoming messages or not.
      */
     public void setFilterMessage(boolean filterMessage) {
-        // CHECKSTYLE:OFF
-		this.filterMessage = filterMessage;
-	}
-    // CHECKSTYLE:ON
+        this.filterMessage = filterMessage;
+    }
 
     /**
      * Returns whether the receiver allows or denies incoming presence or not.
@@ -187,10 +185,8 @@ public class PrivacyItem {
      * @return the iq filtering incoming presence status.
      */
     public boolean isFilterPresenceIn() {
-        // CHECKSTYLE:OFF
-		return filterPresenceIn;
-	}
-    // CHECKSTYLE:ON
+        return filterPresenceIn;
+    }
 
     /**
      * Sets whether the receiver allows or denies incoming presence or not.
@@ -198,10 +194,8 @@ public class PrivacyItem {
      * @param filterPresenceIn indicates if the receiver allows or denies filtering incoming presence.
      */
     public void setFilterPresenceIn(boolean filterPresenceIn) {
-        // CHECKSTYLE:OFF
-		this.filterPresenceIn = filterPresenceIn;
-	}
-    // CHECKSTYLE:ON
+        this.filterPresenceIn = filterPresenceIn;
+    }
 
     /**
      * Returns whether the receiver allows or denies incoming presence or not.
@@ -209,10 +203,8 @@ public class PrivacyItem {
      * @return the iq filtering incoming presence status.
      */
     public boolean isFilterPresenceOut() {
-        // CHECKSTYLE:OFF
-		return filterPresenceOut;
-	}
-    // CHECKSTYLE:ON
+        return filterPresenceOut;
+    }
 
     /**
      * Sets whether the receiver allows or denies outgoing presence or not.
@@ -220,10 +212,8 @@ public class PrivacyItem {
      * @param filterPresenceOut indicates if the receiver allows or denies filtering outgoing presence
      */
     public void setFilterPresenceOut(boolean filterPresenceOut) {
-        // CHECKSTYLE:OFF
-		this.filterPresenceOut = filterPresenceOut;
-	}
-    // CHECKSTYLE:ON
+        this.filterPresenceOut = filterPresenceOut;
+    }
 
     /**
      * Returns the order where the receiver is processed. List items are processed in
@@ -234,11 +224,9 @@ public class PrivacyItem {
      *
      * @return the order number.
      */
-    public long getOrder() {
-        // CHECKSTYLE:OFF
-		return order;
-	}
-    // CHECKSTYLE:ON
+    public UInt32 getOrder() {
+        return order;
+    }
 
     /**
      * Returns the type hold the kind of communication it will allow or block.
@@ -248,9 +236,7 @@ public class PrivacyItem {
      */
     public Type getType() {
         return type;
-    // CHECKSTYLE:OFF
-	}
-    // CHECKSTYLE:ON
+    }
 
     /**
      * Returns the element identifier to apply the action.
@@ -265,9 +251,7 @@ public class PrivacyItem {
      */
     public String getValue() {
         return value;
-        // CHECKSTYLE:OFF
-	}
-    // CHECKSTYLE:ON
+    }
 
     /**
      * Returns whether the receiver allows or denies every kind of communication.
@@ -278,23 +262,22 @@ public class PrivacyItem {
      * @return the all communications status.
      */
     public boolean isFilterEverything() {
-        // CHECKSTYLE:OFF
-		return !(this.isFilterIQ() || this.isFilterMessage() || this.isFilterPresenceIn()
-				|| this.isFilterPresenceOut());
-	}
+        return !(this.isFilterIQ() || this.isFilterMessage() || this.isFilterPresenceIn()
+                || this.isFilterPresenceOut());
+    }
 
-	/**
-	 * Answer an xml representation of the receiver according to the RFC 3921.
-	 *
-	 * @return the text xml representation.
+    /**
+     * Answer an xml representation of the receiver according to the RFC 3921.
+     *
+     * @return the text xml representation.
      */
     public String toXML() {
         StringBuilder buf = new StringBuilder();
         buf.append("<item");
         if (this.isAllow()) {
-        	buf.append(" action=\"allow\"");
+            buf.append(" action=\"allow\"");
         } else {
-        	buf.append(" action=\"deny\"");
+            buf.append(" action=\"deny\"");
         }
         buf.append(" order=\"").append(getOrder()).append('"');
         if (getType() != null) {
@@ -304,24 +287,23 @@ public class PrivacyItem {
             buf.append(" value=\"").append(getValue()).append('"');
         }
         if (isFilterEverything()) {
-        	buf.append("/>");
+            buf.append("/>");
         } else {
-        	buf.append('>');
-        	if (this.isFilterIQ()) {
-            	buf.append("<iq/>");
+            buf.append('>');
+            if (this.isFilterIQ()) {
+                buf.append("<iq/>");
             }
-        	if (this.isFilterMessage()) {
-            	buf.append("<message/>");
+            if (this.isFilterMessage()) {
+                buf.append("<message/>");
             }
-        	if (this.isFilterPresenceIn()) {
-            	buf.append("<presence-in/>");
+            if (this.isFilterPresenceIn()) {
+                buf.append("<presence-in/>");
             }
-        	if (this.isFilterPresenceOut()) {
-            	buf.append("<presence-out/>");
+            if (this.isFilterPresenceOut()) {
+                buf.append("<presence-out/>");
             }
-        	buf.append("</item>");
+            buf.append("</item>");
         }
-        // CHECKSTYLE:ON
         return buf.toString();
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
index 411042e3f..792fdd299 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java
@@ -19,16 +19,16 @@ package org.jivesoftware.smackx.privacy.provider;
 import java.io.IOException;
 import java.util.ArrayList;
 
+import org.jivesoftware.smack.datatypes.UInt32;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.privacy.packet.Privacy;
 import org.jivesoftware.smackx.privacy.packet.PrivacyItem;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * The PrivacyProvider parses {@link Privacy} packets. {@link Privacy}
  * Parses the <tt>query</tt> sub-document and creates an instance of {@link Privacy}.
@@ -45,8 +45,8 @@ public class PrivacyProvider extends IQProvider<Privacy> {
         Privacy privacy = new Privacy();
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 // CHECKSTYLE:OFF
                 if (parser.getName().equals("active")) {
                     String activeName = parser.getAttributeValue("", "name");
@@ -69,7 +69,7 @@ public class PrivacyProvider extends IQProvider<Privacy> {
                     parseList(parser, privacy);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("query")) {
                     done = true;
                 }
@@ -85,15 +85,15 @@ public class PrivacyProvider extends IQProvider<Privacy> {
         String listName = parser.getAttributeValue("", "name");
         ArrayList<PrivacyItem> items = new ArrayList<>();
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("item")) {
                     // CHECKSTYLE:OFF
                     items.add(parseItem(parser));
                     // CHECKSTYLE:ON
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("list")) {
                     done = true;
                 }
@@ -110,7 +110,7 @@ public class PrivacyProvider extends IQProvider<Privacy> {
         // Retrieves the required attributes
         String actionValue = parser.getAttributeValue("", "action");
         // Set the order number, this attribute is required
-        long order = ParserUtils.getLongAttribute(parser, "order");
+        UInt32 order = ParserUtils.getUInt32Attribute(parser, "order");
 
         // If type is not set, then it's the fall-through case
         String type = parser.getAttributeValue("", "type");
@@ -152,9 +152,9 @@ public class PrivacyProvider extends IQProvider<Privacy> {
         final int initialDepth = parser.getDepth();
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "iq":
@@ -171,10 +171,14 @@ public class PrivacyProvider extends IQProvider<Privacy> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
index d9cc09e92..162935d81 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java
@@ -665,8 +665,10 @@ public class ConfigureForm extends Form {
         String fieldName = nodeField.getFieldName();
 
         if (getField(fieldName) == null) {
-            FormField field = new FormField(fieldName);
-            field.setType(type);
+            FormField field = FormField.builder()
+                            .setVariable(fieldName)
+                            .setType(type)
+                            .build();
             addField(field);
         }
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
index 0fec92dfe..9bdaaef15 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java
@@ -27,7 +27,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
  * extensions.  This effectively extends the idea of an extension within one of the
  * top level {@link Stanza} types to consider any embedded element to be an extension
  * of its parent.  This more easily enables the usage of some of Smacks parsing
- * utilities such as {@link PacketParserUtils#parseExtensionElement(String, String, org.xmlpull.v1.XmlPullParser, org.jivesoftware.smack.packet.XmlEnvironment)} to be used
+ * utilities such as {@link PacketParserUtils#parseExtensionElement(String, String, org.jivesoftware.smack.xml.XmlPullParser, org.jivesoftware.smack.packet.XmlEnvironment)} to be used
  * to parse any element of the XML being parsed.
  *
  * <p>Top level extensions have only one element, but they can have multiple children, or
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
index 529ff1fa1..4d1089ed5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
@@ -22,11 +22,9 @@ import javax.xml.namespace.QName;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.PacketParserUtils;
-import org.jivesoftware.smack.util.ParserUtils;
 import org.jivesoftware.smack.util.StringUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * The default payload representation for {@link PayloadItem#getPayload()}.  It simply
@@ -53,7 +51,7 @@ public class SimplePayload implements ExtensionElement {
         catch (XmlPullParserException | IOException e) {
             throw new AssertionError(e);
         }
-        QName qname = ParserUtils.getQName(parser);
+        QName qname = parser.getQName();
 
         payload = xmlPayload;
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
index ddd095b3a..a5cb0ab6d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java
@@ -209,9 +209,9 @@ public class SubscribeForm extends Form {
         String fieldName = nodeField.getFieldName();
 
         if (getField(fieldName) == null) {
-            FormField field = new FormField(fieldName);
+            FormField.Builder field = FormField.builder(fieldName);
             field.setType(type);
-            addField(field);
+            addField(field.build());
         }
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java
index fdf612902..ecdb5deb1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java
@@ -21,12 +21,12 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.pubsub.Affiliation;
 import org.jivesoftware.smackx.pubsub.Affiliation.AffiliationNamespace;
 
 import org.jxmpp.jid.BareJid;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Parses the affiliation element out of the reply stanza from the server
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
index 89319c8d9..4c7d0e7ce 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
@@ -24,6 +24,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.pubsub.Item;
 import org.jivesoftware.smackx.pubsub.Item.ItemNamespace;
@@ -31,9 +33,6 @@ import org.jivesoftware.smackx.pubsub.PayloadItem;
 import org.jivesoftware.smackx.pubsub.SimplePayload;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parses an <b>item</b> element as is defined in both the {@link PubSubNamespace#basic} and
  * {@link PubSubNamespace#event} namespaces. To parse the item contents, it will use whatever
@@ -51,9 +50,9 @@ public class ItemProvider extends ExtensionElementProvider<Item>  {
         String xmlns = parser.getNamespace();
         ItemNamespace itemNamespace = ItemNamespace.fromXmlns(xmlns);
 
-        int tag = parser.next();
+        XmlPullParser.Event tag = parser.next();
 
-        if (tag == XmlPullParser.END_TAG)  {
+        if (tag == XmlPullParser.Event.END_ELEMENT)  {
             return new Item(itemNamespace, id, node);
         }
         else {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
index 2435b3c29..1faf9ea59 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
@@ -23,13 +23,12 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.pubsub.packet.PubSub;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parses the root PubSub stanza extensions of the {@link IQ} stanza and returns
  * a {@link PubSub} instance.
@@ -44,16 +43,19 @@ public class PubSubProvider extends IQProvider<PubSub> {
         PubSub pubsub = new PubSub(pubSubNamespace);
 
         outerloop: while (true)  {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 PacketParserUtils.addExtensionElement(pubsub, parser, xmlEnvironment);
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return pubsub;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
index 306258503..88f3c2e82 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java
@@ -21,12 +21,12 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.pubsub.Subscription;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Parses the <b>subscription</b> element out of the PubSub IQ message from
@@ -44,17 +44,17 @@ public class SubscriptionProvider extends ExtensionElementProvider<Subscription>
         String state = parser.getAttributeValue(null, "subscription");
         boolean isRequired = false;
 
-        int tag = parser.next();
+        XmlPullParser.Event tag = parser.next();
 
-        if ((tag == XmlPullParser.START_TAG) && parser.getName().equals("subscribe-options")) {
+        if ((tag == XmlPullParser.Event.START_ELEMENT) && parser.getName().equals("subscribe-options")) {
             tag = parser.next();
 
-            if ((tag == XmlPullParser.START_TAG) && parser.getName().equals("required"))
+            if ((tag == XmlPullParser.Event.START_ELEMENT) && parser.getName().equals("required"))
                 isRequired = true;
 
-            while (tag != XmlPullParser.END_TAG && !parser.getName().equals("subscribe-options")) tag = parser.next();
+            while (tag != XmlPullParser.Event.END_ELEMENT && !parser.getName().equals("subscribe-options")) tag = parser.next();
         }
-        while (parser.getEventType() != XmlPullParser.END_TAG) parser.next();
+        while (parser.getEventType() != XmlPullParser.Event.END_ELEMENT) parser.next();
         return new Subscription(jid, nodeId, subId, (state == null ? null : Subscription.State.valueOf(state)), isRequired);
     }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java
index 4d867a9d9..0ecef64f7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java
@@ -24,9 +24,8 @@ import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.packet.id.StanzaIdUtil;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * Represents a <b>message delivery receipt request</b> entry as specified by
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/provider/RSMSetProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/provider/RSMSetProvider.java
index 0ee24acfe..521810a45 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/provider/RSMSetProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/provider/RSMSetProvider.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2014-2016 Florian Schmaus
+ * Copyright © 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,11 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.rsm.packet.RSMSet;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class RSMSetProvider extends ExtensionElementProvider<RSMSet> {
 
     public static final RSMSetProvider INSTANCE = new RSMSetProvider();
@@ -44,9 +43,9 @@ public class RSMSetProvider extends ExtensionElementProvider<RSMSet> {
         int firstIndex = -1;
 
         outerloop: while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "after":
@@ -74,10 +73,14 @@ public class RSMSetProvider extends ExtensionElementProvider<RSMSet> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return new RSMSet(after, before, count, index, last, max, firstString,
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
index 90879e415..702e494ea 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
@@ -21,13 +21,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xdata.Form;
 import org.jivesoftware.smackx.xdata.FormField;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * SimpleUserSearch is used to support the non-dataform type of XEP 55. This provides
  * the mechanism for allowing always type ReportedData to be returned by any search result,
@@ -109,16 +108,16 @@ class SimpleUserSearch extends IQ {
                 fields.add(field);
             }
 
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG && parser.getName().equals("item")) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getName().equals("item")) {
                 fields = new ArrayList<>();
             }
-            else if (eventType == XmlPullParser.END_TAG && parser.getName().equals("item")) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT && parser.getName().equals("item")) {
                 ReportedData.Row row = new ReportedData.Row(fields);
                 data.addRow(row);
             }
-            else if (eventType == XmlPullParser.START_TAG) {
+            else if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 String name = parser.getName();
                 String value = parser.nextText();
 
@@ -141,7 +140,7 @@ class SimpleUserSearch extends IQ {
                     data.addColumn(column);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("query")) {
                     done = true;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
index a8921b772..cf22f3266 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java
@@ -28,14 +28,14 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xdata.Form;
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
 import org.jxmpp.jid.DomainBareJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Implements the protocol currently used to search information repositories on the Jabber network. To date, the jabber:iq:search protocol
@@ -136,21 +136,21 @@ public class UserSearch extends SimpleIQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && parser.getName().equals("instructions")) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getName().equals("instructions")) {
                     buildDataForm(simpleUserSearch, parser.nextText(), parser, xmlEnvironment);
                     return simpleUserSearch;
                 }
-                else if (eventType == XmlPullParser.START_TAG && parser.getName().equals("item")) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getName().equals("item")) {
                     simpleUserSearch.parseItems(parser);
                     return simpleUserSearch;
                 }
-                else if (eventType == XmlPullParser.START_TAG && parser.getNamespace().equals("jabber:x:data")) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getNamespace().equals("jabber:x:data")) {
                     // Otherwise, it must be a packet extension.
                     search = new UserSearch();
                     PacketParserUtils.addExtensionElement(search, parser, xmlEnvironment);
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("query")) {
                         done = true;
                     }
@@ -171,11 +171,11 @@ public class UserSearch extends SimpleIQ {
         dataForm.setTitle("User Search");
         dataForm.addInstruction(instructions);
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG && !parser.getNamespace().equals("jabber:x:data")) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT && !parser.getNamespace().equals("jabber:x:data")) {
                 String name = parser.getName();
-                FormField field = new FormField(name);
+                FormField.Builder field = FormField.builder(name);
 
                 // Handle hard coded values.
                 if (name.equals("first")) {
@@ -192,14 +192,14 @@ public class UserSearch extends SimpleIQ {
                 }
 
                 field.setType(FormField.Type.text_single);
-                dataForm.addField(field);
+                dataForm.addField(field.build());
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("query")) {
                     done = true;
                 }
             }
-            else if (eventType == XmlPullParser.START_TAG && parser.getNamespace().equals("jabber:x:data")) {
+            else if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getNamespace().equals("jabber:x:data")) {
                 PacketParserUtils.addExtensionElement(search, parser, xmlEnvironment);
                 done = true;
             }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
index 6427d46e3..82517631c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
@@ -23,9 +23,8 @@ import java.util.List;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * IQ stanza used for discovering the user's shared groups and for getting the answer back
@@ -77,11 +76,11 @@ public class SharedGroupsInfo extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && parser.getName().equals("group")) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && parser.getName().equals("group")) {
                     groupsInfo.getGroups().add(parser.nextText());
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("sharedgroup")) {
                         done = true;
                     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java
index dd53595db..19f45213f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java
@@ -21,7 +21,7 @@ import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 /**
- * Represents a <b>Header</b> entry as specified by the <a href="http://xmpp.org/extensions/xep-031.html">Stanza Headers and Internet Metadata (SHIM)</a>.
+ * Represents a <b>Header</b> entry as specified by the <a href="http://xmpp.org/extensions/xep-0131.html">Stanza Headers and Internet Metadata (SHIM)</a>.
 
  * @author Robin Collier
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java
index d145a7aa6..a0e2cf452 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java
@@ -20,12 +20,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.shim.packet.Header;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parses the header element as defined in <a href="http://xmpp.org/extensions/xep-0131">Stanza Headers and Internet Metadata (SHIM)</a>.
  *
@@ -39,11 +38,11 @@ public class HeaderProvider extends ExtensionElementProvider<Header> {
 
         parser.next();
 
-        if (parser.getEventType() == XmlPullParser.TEXT) {
+        if (parser.getEventType() == XmlPullParser.Event.TEXT_CHARACTERS) {
             value = parser.getText();
         }
 
-        while (parser.getEventType() != XmlPullParser.END_TAG) {
+        while (parser.getEventType() != XmlPullParser.Event.END_ELEMENT) {
             parser.next();
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
index b724e93da..f1719682c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java
@@ -25,6 +25,8 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.si.packet.StreamInitiation;
 import org.jivesoftware.smackx.si.packet.StreamInitiation.File;
@@ -32,8 +34,6 @@ import org.jivesoftware.smackx.xdata.packet.DataForm;
 import org.jivesoftware.smackx.xdata.provider.DataFormProvider;
 
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * The StreamInitiationProvider parses StreamInitiation packets.
@@ -66,14 +66,13 @@ public class StreamInitiationProvider extends IQProvider<StreamInitiation> {
         DataForm form = null;
         DataFormProvider dataFormProvider = new DataFormProvider();
 
-        int eventType;
         String elementName;
         String namespace;
         while (!done) {
-            eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             elementName = parser.getName();
             namespace = parser.getNamespace();
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (elementName.equals("file")) {
                     name = parser.getAttributeValue("", "name");
                     size = parser.getAttributeValue("", "size");
@@ -87,7 +86,7 @@ public class StreamInitiationProvider extends IQProvider<StreamInitiation> {
                         && namespace.equals("jabber:x:data")) {
                     form = dataFormProvider.parse(parser);
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (elementName.equals("si")) {
                     done = true;
                 } else if (elementName.equals("file")) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
index 452b5a529..244762f4a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java
@@ -357,7 +357,7 @@ public final class VCard extends IQ {
     /**
      * Set the avatar for the VCard by specifying the url to the image.
      *
-     * @param avatarURL the url to the image(png,jpeg,gif,bmp)
+     * @param avatarURL the url to the image(png, jpeg, gif, bmp)
      */
     public void setAvatar(URL avatarURL) {
         byte[] bytes = new byte[0];
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java
index a45aa6db5..6aa7140f8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java
@@ -21,12 +21,11 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.vcardtemp.packet.VCard;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * vCard provider.
  *
@@ -74,9 +73,9 @@ public class VCardProvider extends IQProvider<VCard> {
         String name = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 name = parser.getName();
                 switch (name) {
                 case "N":
@@ -107,12 +106,13 @@ public class VCardProvider extends IQProvider<VCard> {
                     break;
                 }
                 break;
-            case XmlPullParser.TEXT:
+            case TEXT_CHARACTERS:
                 if (initialDepth + 1 == parser.getDepth()) {
-                    vCard.setField(name, parser.getText());
+                    String text = parser.getText();
+                    vCard.setField(name, text);
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -129,9 +129,9 @@ public class VCardProvider extends IQProvider<VCard> {
         final int initialDepth = parser.getDepth();
         boolean isWork = true;
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 if ("HOME".equals(name)) {
                     isWork = false;
@@ -149,7 +149,7 @@ public class VCardProvider extends IQProvider<VCard> {
                     }
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -166,9 +166,9 @@ public class VCardProvider extends IQProvider<VCard> {
         String telLabel = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 if ("HOME".equals(name)) {
                     isWork = false;
@@ -196,7 +196,7 @@ public class VCardProvider extends IQProvider<VCard> {
                     }
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -211,9 +211,9 @@ public class VCardProvider extends IQProvider<VCard> {
         final int initialDepth = parser.getDepth();
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "ORGNAME":
@@ -226,7 +226,7 @@ public class VCardProvider extends IQProvider<VCard> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -242,9 +242,9 @@ public class VCardProvider extends IQProvider<VCard> {
         boolean isWork = false;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "WORK":
@@ -262,7 +262,7 @@ public class VCardProvider extends IQProvider<VCard> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -277,9 +277,9 @@ public class VCardProvider extends IQProvider<VCard> {
         final int initialDepth = parser.getDepth();
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "FAMILY":
@@ -301,7 +301,7 @@ public class VCardProvider extends IQProvider<VCard> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -319,9 +319,9 @@ public class VCardProvider extends IQProvider<VCard> {
         String mimetype = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "BINVAL":
@@ -334,7 +334,7 @@ public class VCardProvider extends IQProvider<VCard> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
index f73c1c2c8..14be9d63c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.xdata;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -78,7 +79,7 @@ public class Form {
     /**
      * Creates a new Form of a given type from scratch.
      *
-     * @param type the form's type (e.g. form, submit,cancel,result).
+     * @param type the form's type (e.g. form, submit, cancel, result).
      */
     public Form(DataForm.Type type) {
         this.dataForm = new DataForm(type);
@@ -107,7 +108,7 @@ public class Form {
      * @throws IllegalArgumentException if the form does not include the specified variable or
      *      if the answer type does not correspond with the field type..
      */
-    public void setAnswer(String variable, String value) {
+    public void setAnswer(String variable, CharSequence value) {
         FormField field = getField(variable);
         if (field == null) {
             throw new IllegalArgumentException("Field not found for the specified variable name.");
@@ -260,8 +261,9 @@ public class Form {
             throw new IllegalStateException("Cannot set an answer if the form is not of type " +
             "\"submit\"");
         }
-        field.resetValues();
-        field.addValue(value.toString());
+
+        FormField filledOutfield = field.buildAnswer().addValue(value.toString()).build();
+        dataForm.replaceField(filledOutfield);
     }
 
     /**
@@ -277,7 +279,7 @@ public class Form {
      * @throws IllegalStateException if the form is not of type "submit".
      * @throws IllegalArgumentException if the form does not include the specified variable.
      */
-    public void setAnswer(String variable, List<? extends CharSequence> values) {
+    public void setAnswer(String variable, Collection<? extends CharSequence> values) {
         if (!isSubmitType()) {
             throw new IllegalStateException("Cannot set an answer if the form is not of type " +
             "\"submit\"");
@@ -295,10 +297,9 @@ public class Form {
             default:
                 throw new IllegalArgumentException("This field only accept list of values.");
             }
-            // Clear the old values
-            field.resetValues();
-            // Set the new values. The string representation of each value will be actually used.
-            field.addValues(values);
+
+            FormField filledOutfield = field.buildAnswer().addValues(values).build();
+            dataForm.replaceField(filledOutfield);
         }
         else {
             throw new IllegalArgumentException("Couldn't find a field for the specified variable.");
@@ -321,12 +322,12 @@ public class Form {
         }
         FormField field = getField(variable);
         if (field != null) {
-            // Clear the old values
-            field.resetValues();
+            FormField.Builder filledOutFormFieldBuilder = field.buildAnswer();
             // Set the default value
             for (CharSequence value : field.getValues()) {
-                field.addValue(value);
+                filledOutFormFieldBuilder.addValue(value);
             }
+            dataForm.replaceField(filledOutFormFieldBuilder.build());
         }
         else {
             throw new IllegalArgumentException("Couldn't find a field for the specified variable.");
@@ -497,9 +498,9 @@ public class Form {
             // Add to the new form any type of field that includes a variable.
             // Note: The fields of type FIXED are the only ones that don't specify a variable
             if (field.getVariable() != null) {
-                FormField newField = new FormField(field.getVariable());
+                FormField.Builder newField = FormField.builder(field.getVariable());
                 newField.setType(field.getType());
-                form.addField(newField);
+                form.addField(newField.build());
                 // Set the answer ONLY to the hidden fields
                 if (field.getType() == FormField.Type.hidden) {
                     // Since a hidden field could have many values we need to collect them
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
index d092d7092..6eca9b39e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software.
+ * Copyright 2003-2007 Jive Software, 2019 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,23 @@ package org.jivesoftware.smackx.xdata;
 
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
-import org.jivesoftware.smack.packet.NamedElement;
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.packet.FullyQualifiedElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
-import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.util.CollectionUtil;
+import org.jivesoftware.smack.util.EqualsUtil;
+import org.jivesoftware.smack.util.HashCode;
+import org.jivesoftware.smack.util.MultiMap;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
-import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
+import org.jivesoftware.smackx.xdata.packet.DataForm;
 
 import org.jxmpp.util.XmppDateTime;
 
@@ -39,10 +46,14 @@ import org.jxmpp.util.XmppDateTime;
  *
  * @author Gaston Dombiak
  */
-public class FormField implements NamedElement {
+public final class FormField implements FullyQualifiedElement {
 
     public static final String ELEMENT = "field";
 
+    public static final String NAMESPACE = DataForm.NAMESPACE;
+
+    public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
     /**
      * The constant String "FORM_TYPE".
      */
@@ -140,33 +151,91 @@ public class FormField implements NamedElement {
         }
     }
 
+    /**
+     * The field's name. Put as value in the 'var' attribute of &lt;field/&gt;.
+     */
     private final String variable;
 
-    private String description;
-    private boolean required = false;
-    private String label;
-    private Type type;
-    private final List<Option> options = new ArrayList<>();
-    private final List<CharSequence> values = new ArrayList<>();
-    private ValidateElement validateElement;
+    private final String label;
 
-    /**
-     * Creates a new FormField with the variable name that uniquely identifies the field
-     * in the context of the form.
-     *
-     * @param variable the variable name of the question.
+    private final Type type;
+
+    private final List<FormFieldChildElement> formFieldChildElements;
+
+    private final MultiMap<QName, FormFieldChildElement> formFieldChildElementsMap;
+
+    /*
+     * The following four fields are cache values which are represented as child elements of </form> and hence also
+     * appear in formFieldChildElements.
      */
-    public FormField(String variable) {
-        this.variable = StringUtils.requireNotNullNorEmpty(variable, "Variable must not be null nor empty");
+    private final List<Option> options;
+    private final List<CharSequence> values;
+    private final String description;
+    private final boolean required;
+
+    private MultiMap<QName, FormFieldChildElement> createChildElementsMap() {
+        MultiMap<QName, FormFieldChildElement> formFieldChildElementsMap = new MultiMap<>(formFieldChildElements.size());
+        for (FormFieldChildElement formFieldChildElement : formFieldChildElements) {
+            formFieldChildElementsMap.put(formFieldChildElement.getQName(), formFieldChildElement);
+        }
+        return formFieldChildElementsMap.asUnmodifiableMultiMap();
     }
 
-    /**
-     * Creates a new FormField of type FIXED. The fields of type FIXED do not define a variable
-     * name.
-     */
-    public FormField() {
-        this.variable = null;
-        this.type = Type.fixed;
+    private FormField(String value) {
+        variable = FORM_TYPE;
+        type = Type.hidden;
+        label = null;
+        required = false;
+        description = null;
+
+        formFieldChildElements = Collections.singletonList(new Value(value));
+        values = Collections.singletonList(value);
+        options = Collections.emptyList();
+
+        formFieldChildElementsMap = createChildElementsMap();
+    }
+
+    private FormField(Builder builder) {
+        variable = builder.variable;
+        label = builder.label;
+        type = builder.type;
+        if (builder.formFieldChildElements != null) {
+            formFieldChildElements = Collections.unmodifiableList(builder.formFieldChildElements);
+        } else {
+            formFieldChildElements = Collections.emptyList();
+        }
+
+        if (variable == null && type != Type.fixed) {
+            throw new IllegalArgumentException("The variable can only be null if the form is of type fixed");
+        }
+
+        String description = null;
+        boolean requiredElementAsChild = false;
+        ArrayList<Option> options = new ArrayList<>(formFieldChildElements.size());
+        ArrayList<CharSequence> values = new ArrayList<>(formFieldChildElements.size());
+        for (FormFieldChildElement formFieldChildElement : formFieldChildElements) {
+            if (formFieldChildElement instanceof Value) {
+                Value value = (Value) formFieldChildElement;
+                values.add(value.getValue());
+            } else if (formFieldChildElement instanceof Option) {
+                Option option = (Option) formFieldChildElement;
+                options.add(option);
+            } else if (formFieldChildElement instanceof Description) {
+                description = ((Description) formFieldChildElement).getDescription();
+            // Required is a singleton instance.
+            } else if (formFieldChildElement == Required.INSTANCE) {
+                requiredElementAsChild = true;
+            }
+        }
+        options.trimToSize();
+        values.trimToSize();
+        this.options = Collections.unmodifiableList(options);
+        this.values = Collections.unmodifiableList(values);
+        this.description = description;
+
+        required = requiredElementAsChild;
+
+        formFieldChildElementsMap = createChildElementsMap();
     }
 
     /**
@@ -200,9 +269,7 @@ public class FormField implements NamedElement {
      * @return List of the available options.
      */
     public List<Option> getOptions() {
-        synchronized (options) {
-            return Collections.unmodifiableList(new ArrayList<>(options));
-        }
+        return options;
     }
 
     /**
@@ -221,6 +288,9 @@ public class FormField implements NamedElement {
      * @see Type
      */
     public Type getType() {
+        if (type == null) {
+            return Type.text_single;
+        }
         return type;
     }
 
@@ -255,7 +325,7 @@ public class FormField implements NamedElement {
     }
 
     /**
-     * Returns the first value of this form fold or {@code null}.
+     * Returns the first value of this form field or {@code null}.
      *
      * @return the first value or {@code null}
      * @since 4.3
@@ -289,143 +359,25 @@ public class FormField implements NamedElement {
     }
 
     /**
-     * Returns the variable name that the question is filling out.
+     * Returns the field's name, also known as the variable name in case this is an filled out answer form.
      * <p>
      * According to XEP-4 § 3.2 the variable name (the 'var' attribute)
      * "uniquely identifies the field in the context of the form" (if the field is not of type 'fixed', in which case
      * the field "MAY possess a 'var' attribute")
      * </p>
      *
-     * @return the variable name of the question.
+     * @return the field's name.
      */
     public String getVariable() {
         return variable;
     }
 
-    /**
-     * Get validate element.
-     *
-     * @return the validateElement
-     */
-    public ValidateElement getValidateElement() {
-        return validateElement;
+    public FormFieldChildElement getFormFieldChildElement(QName qname) {
+        return formFieldChildElementsMap.getFirst(qname);
     }
 
-    /**
-     * Sets a description that provides extra clarification about the question. This information
-     * could be presented to the user either in tool-tip, help button, or as a section of text
-     * before the question.
-     * <p>
-     * If the question is of type FIXED then the description should remain empty.
-     * </p>
-     *
-     * @param description provides extra clarification about the question.
-     */
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    /**
-     * Sets the label of the question which should give enough information to the user to
-     * fill out the form.
-     *
-     * @param label the label of the question.
-     */
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-    /**
-     * Sets if the question must be answered in order to complete the questionnaire.
-     *
-     * @param required if the question must be answered in order to complete the questionnaire.
-     */
-    public void setRequired(boolean required) {
-        this.required = required;
-    }
-
-    /**
-     * Set validate element.
-     * @param validateElement the validateElement to set
-     */
-    public void setValidateElement(ValidateElement validateElement) {
-        validateElement.checkConsistency(this);
-        this.validateElement = validateElement;
-    }
-
-    /**
-     * Sets an indicative of the format for the data to answer.
-     * <p>
-     * This method will throw an IllegalArgumentException if type is 'fixed'. To create FormFields of type 'fixed' use
-     * {@link #FormField()} instead.
-     * </p>
-     *
-     * @param type an indicative of the format for the data to answer.
-     * @see Type
-     * @throws IllegalArgumentException if type is 'fixed'.
-     */
-    public void setType(Type type) {
-        if (type == Type.fixed) {
-            throw new IllegalArgumentException("Can not set type to fixed, use FormField constructor without arguments instead.");
-        }
-        this.type = type;
-    }
-
-    /**
-     * Adds a default value to the question if the question is part of a form to fill out.
-     * Otherwise, adds an answered value to the question.
-     *
-     * @param value a default value or an answered value of the question.
-     */
-    public void addValue(CharSequence value) {
-        synchronized (values) {
-            values.add(value);
-        }
-    }
-
-    /**
-     * Adds the given Date as XEP-0082 formated string by invoking {@link #addValue(CharSequence)} after the date
-     * instance was formated.
-     *
-     * @param date the date instance to add as XEP-0082 formated string.
-     * @since 4.3.0
-     */
-    public void addValue(Date date) {
-        String dateString = XmppDateTime.formatXEP0082Date(date);
-        addValue(dateString);
-    }
-
-    /**
-     * Adds a default values to the question if the question is part of a form to fill out.
-     * Otherwise, adds an answered values to the question.
-     *
-     * @param newValues default values or an answered values of the question.
-     */
-    public void addValues(List<? extends CharSequence> newValues) {
-        synchronized (values) {
-            values.addAll(newValues);
-        }
-    }
-
-    /**
-     * Removes all the values of the field.
-     */
-    protected void resetValues() {
-        synchronized (values) {
-            values.clear();
-        }
-    }
-
-    /**
-     * Adss an available options to the question that the user has in order to answer
-     * the question.
-     *
-     * @param option a new available option for the question.
-     */
-    public void addOption(Option option) {
-        synchronized (options) {
-            options.add(option);
-        }
+    public List<FormFieldChildElement> getFormFieldChildElements(QName qname) {
+        return formFieldChildElementsMap.getAll(qname);
     }
 
     @Override
@@ -433,27 +385,42 @@ public class FormField implements NamedElement {
         return ELEMENT;
     }
 
+    @Override
+    public String getNamespace() {
+        return NAMESPACE;
+    }
+
+    @Override
+    public QName getQName() {
+        return QNAME;
+    }
+
+    public Builder buildAnswer() {
+        return asBuilder().resetValues();
+    }
+
+    public Builder asBuilder() {
+        return new Builder(this);
+    }
+
     @Override
     public XmlStringBuilder toXML(XmlEnvironment enclosingNamespace) {
-        XmlStringBuilder buf = new XmlStringBuilder(this);
+        XmlStringBuilder buf = new XmlStringBuilder(this, enclosingNamespace);
         // Add attributes
         buf.optAttribute("label", getLabel());
         buf.optAttribute("var", getVariable());
-        buf.optAttribute("type", getType());
-        buf.rightAngleBracket();
-        // Add elements
-        buf.optElement("desc", getDescription());
-        buf.condEmptyElement(isRequired(), "required");
-        // Loop through all the values and append them to the string buffer
-        for (CharSequence value : getValues()) {
-            buf.element("value", value);
+        // If no 'type' is specified, the default is "text-single";
+        buf.attribute("type", getType(), Type.text_single);
+
+        if (formFieldChildElements.isEmpty()) {
+            buf.closeEmptyElement();
+        } else {
+            buf.rightAngleBracket();
+
+            buf.append(formFieldChildElements, enclosingNamespace);
+
+            buf.closeElement(this);
         }
-        // Loop through all the values and append them to the string buffer
-        for (Option option : getOptions()) {
-            buf.append(option.toXML());
-        }
-        buf.optElement(validateElement);
-        buf.closeElement(this);
         return buf;
     }
 
@@ -476,23 +443,268 @@ public class FormField implements NamedElement {
         return toXML().toString().hashCode();
     }
 
+    public static FormField hiddenFormType(String value) {
+        return new FormField(value);
+    }
+
+    public static Builder builder(String fieldName) {
+        return builder().setFieldName(fieldName);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private String variable;
+
+        private String label;
+
+        private Type type;
+
+        private List<FormFieldChildElement> formFieldChildElements;
+
+        private boolean disallowType;
+        private boolean disallowFurtherFormFieldChildElements;
+
+        private Builder() {
+        }
+
+        private Builder(FormField formField) {
+            variable = formField.variable;
+            label = formField.label;
+            type = formField.type;
+            // Create a new modifiable list.
+            formFieldChildElements = CollectionUtil.newListWith(formField.formFieldChildElements);
+        }
+
+        public Builder setFieldName(String fieldName) {
+            return setVariable(fieldName);
+        }
+
+        public Builder setVariable(String variable) {
+            this.variable = variable;
+            return this;
+        }
+
+        /**
+         * Sets an indicative of the format for the data to answer.
+         *
+         * @param type an indicative of the format for the data to answer.
+         * @see Type
+         */
+        public Builder setType(Type type) {
+            final Type oldType = this.type;
+
+            this.type = type;
+
+            try {
+                checkFormFieldChildElementsConsistency();
+            } catch (IllegalArgumentException e) {
+                this.type = oldType;
+                throw e;
+            }
+
+            return this;
+        }
+
+        /**
+         * Sets a description that provides extra clarification about the question. This information
+         * could be presented to the user either in tool-tip, help button, or as a section of text
+         * before the question.
+         * <p>
+         * If the question is of type FIXED then the description should remain empty.
+         * </p>
+         *
+         * @param description provides extra clarification about the question.
+         */
+        public Builder setDescription(String description) {
+            Description descriptionElement = new Description(description);
+            setOnlyElement(descriptionElement, Description.class);
+            return this;
+        }
+
+        /**
+         * Sets the label of the question which should give enough information to the user to
+         * fill out the form.
+         *
+         * @param label the label of the question.
+         */
+        public Builder setLabel(String label) {
+            this.label = label;
+            return this;
+        }
+
+        /**
+         * Sets if the question must be answered in order to complete the questionnaire.
+         *
+         * @param required if the question must be answered in order to complete the questionnaire.
+         */
+        public Builder setRequired(boolean required) {
+            setOnlyElement(Required.INSTANCE, Required.class);
+            return this;
+        }
+
+        /**
+         * Adds a default value to the question if the question is part of a form to fill out.
+         * Otherwise, adds an answered value to the question.
+         *
+         * @param value a default value or an answered value of the question.
+         */
+        public Builder addValue(CharSequence value) {
+            return addFormFieldChildElement(new Value(value));
+        }
+
+        /**
+         * Adds the given Date as XEP-0082 formated string by invoking {@link #addValue(CharSequence)} after the date
+         * instance was formated.
+         *
+         * @param date the date instance to add as XEP-0082 formated string.
+         */
+        public Builder addValue(Date date) {
+            String dateString = XmppDateTime.formatXEP0082Date(date);
+            return addValue(dateString);
+        }
+
+        /**
+         * Adds a default values to the question if the question is part of a form to fill out.
+         * Otherwise, adds an answered values to the question.
+         *
+         * @param values default values or an answered values of the question.
+         */
+        public Builder addValues(Collection<? extends CharSequence> values) {
+            for (CharSequence value : values) {
+                addValue(value);
+            }
+            return this;
+        }
+
+        public Builder addOption(String option) {
+            return addOption(new Option(option));
+        }
+
+        /**
+         * Adds an available options to the question that the user has in order to answer
+         * the question.
+         *
+         * @param option a new available option for the question.
+         */
+        public Builder addOption(Option option) {
+            return addFormFieldChildElement(option);
+        }
+
+        public Builder addFormFieldChildElement(FormFieldChildElement formFieldChildElement) {
+            if (disallowFurtherFormFieldChildElements) {
+                throw new IllegalArgumentException();
+            }
+
+            if (formFieldChildElement.requiresNoTypeSet() && type != null) {
+                throw new IllegalArgumentException("Elements of type " + formFieldChildElement.getClass()
+                                + " can only be added to form fields where no type is set");
+            }
+
+            ensureThatFormFieldChildElementsIsSet();
+
+            if (!formFieldChildElements.isEmpty() && formFieldChildElement.isExclusiveElement()) {
+                throw new IllegalArgumentException("Elements of type " + formFieldChildElement.getClass()
+                                + " must be the only child elements of a form field.");
+            }
+
+            disallowType = disallowType || formFieldChildElement.requiresNoTypeSet();
+            disallowFurtherFormFieldChildElements = formFieldChildElement.isExclusiveElement();
+
+            formFieldChildElements.add(formFieldChildElement);
+
+            return this;
+        }
+
+        public Builder resetValues() {
+            if (formFieldChildElements == null) {
+                return this;
+            }
+
+            // TODO: Use Java' stream API once Smack's minimum Android SDK level is 24 or higher.
+            Iterator<FormFieldChildElement> it = formFieldChildElements.iterator();
+            while (it.hasNext()) {
+                FormFieldChildElement formFieldChildElement = it.next();
+                if (formFieldChildElement instanceof Value) {
+                    it.remove();
+                }
+            }
+
+            disallowType = disallowFurtherFormFieldChildElements = false;
+
+            return this;
+        }
+
+        public FormField build() {
+            return new FormField(this);
+        }
+
+        public Type getType() {
+            return type;
+        }
+
+        private void ensureThatFormFieldChildElementsIsSet() {
+            if (formFieldChildElements == null) {
+                formFieldChildElements = new ArrayList<>(4);
+            }
+        }
+
+        private <E extends FormFieldChildElement> void setOnlyElement(E element, Class<E> elementClass) {
+            ensureThatFormFieldChildElementsIsSet();
+            for (int i = 0; i < formFieldChildElements.size(); i++) {
+                if (formFieldChildElements.get(i).getClass().equals(elementClass)) {
+                    formFieldChildElements.set(i, element);
+                    return;
+                }
+            }
+
+            formFieldChildElements.add(0, element);
+        }
+
+        private void checkFormFieldChildElementsConsistency() {
+            if (formFieldChildElements == null) {
+                return;
+            }
+
+            for (FormFieldChildElement formFiledChildElement : formFieldChildElements) {
+                formFiledChildElement.checkConsistency(this);
+            }
+        }
+    }
+
+    /**
+     * Marker class for the standard, as per XEP-0004, child elements of form fields.
+     */
+    private abstract static class StandardFormFieldChildElement implements FormFieldChildElement {
+    }
+
     /**
      * Represents the available option of a given FormField.
      *
      * @author Gaston Dombiak
      */
-    public static final class Option implements NamedElement {
+    public static final class Option extends StandardFormFieldChildElement {
 
         public static final String ELEMENT = "option";
 
-        private final String value;
-        private String label;
+        public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
+        private final String label;
+
+        private final Value value;
 
         public Option(String value) {
-            this.value = value;
+            this(null, value);
         }
 
         public Option(String label, String value) {
+            this.label = label;
+            this.value = new Value(value);
+        }
+
+        public Option(String label, Value value) {
             this.label = label;
             this.value = value;
         }
@@ -511,10 +723,19 @@ public class FormField implements NamedElement {
          *
          * @return the value of the option.
          */
-        public String getValue() {
+        public Value getValue() {
             return value;
         }
 
+        /**
+         * Returns the string representation of the value of the option.
+         *
+         * @return the value of the option.
+         */
+        public String getValueString() {
+            return value.value.toString();
+        }
+
         @Override
         public String toString() {
             return getLabel();
@@ -525,6 +746,16 @@ public class FormField implements NamedElement {
             return ELEMENT;
         }
 
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public QName getQName() {
+            return QNAME;
+        }
+
         @Override
         public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
             XmlStringBuilder xml = new XmlStringBuilder(this);
@@ -533,7 +764,7 @@ public class FormField implements NamedElement {
             xml.rightAngleBracket();
 
             // Add element
-            xml.element("value", getValue());
+            xml.element("value", getValueString());
 
             xml.closeElement(this);
             return xml;
@@ -541,33 +772,149 @@ public class FormField implements NamedElement {
 
         @Override
         public boolean equals(Object obj) {
-            if (obj == null)
-                return false;
-            if (obj == this)
-                return true;
-            if (obj.getClass() != getClass())
-                return false;
+            return EqualsUtil.equals(this, obj, (e, o) -> {
+                e.append(value, o.value)
+                 .append(label, o.label);
+            });
+        }
 
-            Option other = (Option) obj;
+        private final HashCode.Cache hashCodeCache = new HashCode.Cache();
 
-            if (!value.equals(other.value))
-                return false;
+        @Override
+        public int hashCode() {
+            return hashCodeCache.getHashCode(c ->
+                c.append(value)
+                 .append(label)
+            );
+        }
 
-            String thisLabel = label == null ? "" : label;
-            String otherLabel = other.label == null ? "" : other.label;
+    }
 
-            if (!thisLabel.equals(otherLabel))
-                return false;
+    public static class Description extends StandardFormFieldChildElement {
 
+        public static final String ELEMENT = "desc";
+
+        public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
+        private final String description;
+
+        public Description(String description) {
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public QName getQName() {
+            return QNAME;
+        }
+
+        @Override
+        public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
+            XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
+            xml.rightAngleBracket();
+            xml.escape(description);
+            xml.closeElement(this);
+            return xml;
+        }
+    }
+
+    public static final class Required extends StandardFormFieldChildElement {
+
+        public static final Required INSTANCE = new Required();
+
+        public static final String ELEMENT = "required";
+
+        public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
+        private Required() {
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public QName getQName() {
+            return QNAME;
+        }
+
+        @Override
+        public boolean mustBeOnlyOfHisKind() {
             return true;
         }
 
+        @Override
+        public String toXML(XmlEnvironment xmlEnvironment) {
+            return '<' + ELEMENT + "/>";
+        }
+    }
+
+    public static class Value extends StandardFormFieldChildElement {
+
+        public static final String ELEMENT = "value";
+
+        public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
+        private final CharSequence value;
+
+        public Value(CharSequence value) {
+            this.value = value;
+        }
+
+        public CharSequence getValue() {
+            return value;
+        }
+
+        @Override
+        public String getElementName() {
+            return ELEMENT;
+        }
+
+        @Override
+        public String getNamespace() {
+            return NAMESPACE;
+        }
+
+        @Override
+        public QName getQName() {
+            return QNAME;
+        }
+
+        @Override
+        public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
+            XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
+            xml.rightAngleBracket();
+            xml.escape(value);
+            return xml.closeElement(this);
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            return EqualsUtil.equals(this, other, (e, o) -> e.append(this.value, o.value));
+        }
+
         @Override
         public int hashCode() {
-            int result = 1;
-            result = 37 * result + value.hashCode();
-            result = 37 * result + (label == null ? 0 : label.hashCode());
-            return result;
+            return value.hashCode();
         }
     }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormFieldChildElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormFieldChildElement.java
new file mode 100644
index 000000000..62485dfd5
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormFieldChildElement.java
@@ -0,0 +1,39 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata;
+
+import org.jivesoftware.smack.packet.FullyQualifiedElement;
+
+public interface FormFieldChildElement extends FullyQualifiedElement {
+
+    default boolean isExclusiveElement() {
+        return false;
+    }
+
+    default boolean requiresNoTypeSet() {
+        return isExclusiveElement();
+    }
+
+    default boolean mustBeOnlyOfHisKind() {
+        return false;
+    }
+
+    default void checkConsistency(FormField.Builder formFieldBuilder) throws IllegalArgumentException {
+        // Does nothing per default.
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java
index 622955435..38099fa1c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014-2015 Florian Schmaus
+ * Copyright 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,11 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
+import org.jivesoftware.smackx.xdata.provider.DescriptionProvider;
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProviderManager;
+import org.jivesoftware.smackx.xdata.provider.OptionProvider;
+import org.jivesoftware.smackx.xdata.provider.RequiredProvider;
+import org.jivesoftware.smackx.xdata.provider.ValueProvider;
 
 import org.jxmpp.jid.Jid;
 
@@ -40,6 +45,13 @@ public final class XDataManager extends Manager {
     public static final String NAMESPACE = DataForm.NAMESPACE;
 
     static {
+        FormFieldChildElementProviderManager.addFormFieldChildElementProvider(
+                        new DescriptionProvider(),
+                        new OptionProvider(),
+                        new RequiredProvider(),
+                        new ValueProvider()
+        );
+
         XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
             @Override
             public void connectionCreated(XMPPConnection connection) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
index f9744e06a..5c53a24e1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import org.jivesoftware.smack.packet.Element;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jivesoftware.smackx.xdata.FormField;
@@ -160,6 +161,17 @@ public class DataForm implements ExtensionElement {
         }
     }
 
+    public FormField replaceField(FormField field) {
+        String fieldVariableName = field.getVariable();
+
+        synchronized (fields) {
+            if (!fields.containsKey(fieldVariableName)) {
+                throw new IllegalArgumentException("No field with the name " + fieldVariableName + " exists");
+            }
+            return fields.put(fieldVariableName, field);
+        }
+    }
+
     /**
      * Check if a form field with the given variable name exists.
      *
@@ -312,11 +324,16 @@ public class DataForm implements ExtensionElement {
     }
 
     @Override
-    public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
+    public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
         XmlStringBuilder buf = new XmlStringBuilder(this);
         buf.attribute("type", getType());
         buf.rightAngleBracket();
 
+        XmlEnvironment dataFormxmlEnvironment = XmlEnvironment.builder()
+                        .withNamespace(NAMESPACE)
+                        .withNext(xmlEnvironment)
+                        .build();
+
         buf.optElement("title", getTitle());
         for (String instruction : getInstructions()) {
             buf.element("instructions", instruction);
@@ -329,10 +346,8 @@ public class DataForm implements ExtensionElement {
         for (Item item : getItems()) {
             buf.append(item.toXML());
         }
-        // Loop through all the form fields and append them to the string buffer
-        for (FormField field : getFields()) {
-            buf.append(field.toXML());
-        }
+        // Add all form fields.
+        buf.append(getFields(), dataFormxmlEnvironment);
         for (Element element : extensionElements) {
             buf.append(element.toXML());
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
index 502277661..694273163 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java
@@ -20,22 +20,24 @@ package org.jivesoftware.smackx.xdata.provider;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.roster.packet.RosterPacket;
 import org.jivesoftware.smack.roster.provider.RosterPacketProvider;
+import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xdata.FormField;
+import org.jivesoftware.smackx.xdata.FormFieldChildElement;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 import org.jivesoftware.smackx.xdatalayout.packet.DataLayout;
 import org.jivesoftware.smackx.xdatalayout.provider.DataLayoutProvider;
-import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
-import org.jivesoftware.smackx.xdatavalidation.provider.DataValidationProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * The DataFormProvider parses DataForm packets.
@@ -44,6 +46,8 @@ import org.xmlpull.v1.XmlPullParserException;
  */
 public class DataFormProvider extends ExtensionElementProvider<DataForm> {
 
+    private static final Logger LOGGER = Logger.getLogger(DataFormProvider.class.getName());
+
     public static final DataFormProvider INSTANCE = new DataFormProvider();
 
     @Override
@@ -51,11 +55,12 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
         DataForm.Type dataFormType = DataForm.Type.fromString(parser.getAttributeValue("", "type"));
         DataForm dataForm = new DataForm(dataFormType);
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 String namespace = parser.getNamespace();
+                XmlEnvironment elementXmlEnvironment = XmlEnvironment.from(parser, xmlEnvironment);
                 switch (name) {
                 case "instructions":
                     dataForm.addInstruction(parser.nextText());
@@ -64,13 +69,16 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
                     dataForm.setTitle(parser.nextText());
                     break;
                 case "field":
-                    dataForm.addField(parseField(parser));
+                    FormField formField = parseField(parser, elementXmlEnvironment);
+                    dataForm.addField(formField);
                     break;
                 case "item":
-                    dataForm.addItem(parseItem(parser));
+                    DataForm.Item item = parseItem(parser, elementXmlEnvironment);
+                    dataForm.addItem(item);
                     break;
                 case "reported":
-                    dataForm.setReportedData(parseReported(parser));
+                    DataForm.ReportedData reported = parseReported(parser, elementXmlEnvironment);
+                    dataForm.setReportedData(reported);
                     break;
                 // See XEP-133 Example 32 for a corner case where the data form contains this extension.
                 case RosterPacket.ELEMENT:
@@ -86,82 +94,81 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return dataForm;
     }
 
-    private static FormField parseField(XmlPullParser parser) throws XmlPullParserException, IOException {
+    private static FormField parseField(XmlPullParser parser, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         final int initialDepth = parser.getDepth();
+
         final String var = parser.getAttributeValue("", "var");
         final FormField.Type type = FormField.Type.fromString(parser.getAttributeValue("", "type"));
 
-        final FormField formField;
-        if (type == FormField.Type.fixed) {
-            formField = new FormField();
-        } else {
-            formField = new FormField(var);
-            formField.setType(type);
+        final FormField.Builder builder = FormField.builder();
+        builder.setType(type);
+        if (type != FormField.Type.fixed) {
+            builder.setVariable(var);
+        }
+        String label = parser.getAttributeValue("", "label");
+        if (StringUtils.isNotEmpty(label)) {
+            builder.setLabel(label);
         }
-        formField.setLabel(parser.getAttributeValue("", "label"));
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
-                String name = parser.getName();
-                String namespace = parser.getNamespace();
-                switch (name) {
-                case "desc":
-                    formField.setDescription(parser.nextText());
-                    break;
-                case "value":
-                    formField.addValue(parser.nextText());
-                    break;
-                case "required":
-                    formField.setRequired(true);
-                    break;
-                case "option":
-                    formField.addOption(parseOption(parser));
-                    break;
-                // See XEP-122 Data Forms Validation
-                case ValidateElement.ELEMENT:
-                    if (namespace.equals(ValidateElement.NAMESPACE)) {
-                        formField.setValidateElement(DataValidationProvider.parse(parser));
-                    }
-                    break;
+            case START_ELEMENT:
+                QName qname = parser.getQName();
+                FormFieldChildElementProvider<?> provider = FormFieldChildElementProviderManager.getFormFieldChildElementProvider(
+                                qname);
+                if (provider != null) {
+                    FormFieldChildElement formFieldChildElement = provider.parse(parser, XmlEnvironment.from(parser, xmlEnvironment));
+                    builder.addFormFieldChildElement(formFieldChildElement);
+                } else {
+                    LOGGER.warning("Unknown form field child element " + qname + " ignored");
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
-        return formField;
+
+        return builder.build();
     }
 
-    private static DataForm.Item parseItem(XmlPullParser parser) throws XmlPullParserException, IOException {
+    private static DataForm.Item parseItem(XmlPullParser parser, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         final int initialDepth = parser.getDepth();
         List<FormField> fields = new ArrayList<>();
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.TagEvent eventType = parser.nextTag();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "field":
-                    fields.add(parseField(parser));
+                    FormField field = parseField(parser, XmlEnvironment.from(parser, xmlEnvironment));
+                    fields.add(field);
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -171,21 +178,23 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
         return new DataForm.Item(fields);
     }
 
-    private static DataForm.ReportedData parseReported(XmlPullParser parser) throws XmlPullParserException, IOException {
+    private static DataForm.ReportedData parseReported(XmlPullParser parser, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException, SmackParsingException {
         final int initialDepth = parser.getDepth();
         List<FormField> fields = new ArrayList<>();
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.TagEvent eventType = parser.nextTag();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case "field":
-                    fields.add(parseField(parser));
+                    FormField field = parseField(parser, XmlEnvironment.from(parser, xmlEnvironment));
+                    fields.add(field);
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
@@ -195,28 +204,4 @@ public class DataFormProvider extends ExtensionElementProvider<DataForm> {
         return new DataForm.ReportedData(fields);
     }
 
-    private static FormField.Option parseOption(XmlPullParser parser) throws XmlPullParserException, IOException {
-        final int initialDepth = parser.getDepth();
-        FormField.Option option = null;
-        String label = parser.getAttributeValue("", "label");
-        outerloop: while (true) {
-            int eventType = parser.next();
-            switch (eventType) {
-            case XmlPullParser.START_TAG:
-                String name = parser.getName();
-                switch (name) {
-                case "value":
-                    option = new FormField.Option(label, parser.nextText());
-                    break;
-                }
-                break;
-            case XmlPullParser.END_TAG:
-                if (parser.getDepth() == initialDepth) {
-                    break outerloop;
-                }
-                break;
-            }
-        }
-        return option;
-    }
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DescriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DescriptionProvider.java
new file mode 100644
index 000000000..a4956af39
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DescriptionProvider.java
@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata.provider;
+
+import java.io.IOException;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.xdata.FormField;
+
+public class DescriptionProvider extends FormFieldChildElementProvider<FormField.Description> {
+
+    @Override
+    public FormField.Description parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException {
+        String description = parser.nextText();
+        return new FormField.Description(description);
+    }
+
+    @Override
+    public QName getQName() {
+        return FormField.Description.QNAME;
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/FormFieldChildElementProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/FormFieldChildElementProvider.java
new file mode 100644
index 000000000..a0315d7c8
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/FormFieldChildElementProvider.java
@@ -0,0 +1,29 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata.provider;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.provider.Provider;
+
+import org.jivesoftware.smackx.xdata.FormFieldChildElement;
+
+public abstract class FormFieldChildElementProvider<F extends FormFieldChildElement> extends Provider<F> {
+
+    public abstract QName getQName();
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/FormFieldChildElementProviderManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/FormFieldChildElementProviderManager.java
new file mode 100644
index 000000000..8fed9504a
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/FormFieldChildElementProviderManager.java
@@ -0,0 +1,45 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata.provider;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.xml.namespace.QName;
+
+public class FormFieldChildElementProviderManager {
+
+    private static final Map<QName, FormFieldChildElementProvider<?>> providers = new ConcurrentHashMap<>();
+
+    public static void addFormFieldChildElementProvider(
+                    FormFieldChildElementProvider<?>... formFieldChildElementProviders) {
+        for (FormFieldChildElementProvider<?> formFieldChildElementProvider : formFieldChildElementProviders) {
+            QName qname = formFieldChildElementProvider.getQName();
+            providers.put(qname, formFieldChildElementProvider);
+        }
+    }
+
+    public static FormFieldChildElementProvider<?> addFormFieldChildElementProvider(QName qname,
+                    FormFieldChildElementProvider<?> formFieldChildElementProvider) {
+        return providers.put(qname, formFieldChildElementProvider);
+    }
+
+    public static FormFieldChildElementProvider<?> getFormFieldChildElementProvider(QName qname) {
+        return providers.get(qname);
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/OptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/OptionProvider.java
new file mode 100644
index 000000000..7253727e2
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/OptionProvider.java
@@ -0,0 +1,63 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata.provider;
+
+import java.io.IOException;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.xdata.FormField;
+
+public class OptionProvider extends FormFieldChildElementProvider<FormField.Option> {
+
+    @Override
+    public FormField.Option parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        FormField.Option option = null;
+        String label = parser.getAttributeValue("", "label");
+        outerloop: while (true) {
+            XmlPullParser.TagEvent eventType = parser.nextTag();
+            switch (eventType) {
+            case START_ELEMENT:
+                String name = parser.getName();
+                switch (name) {
+                case "value":
+                    option = new FormField.Option(label, parser.nextText());
+                    break;
+                }
+                break;
+            case END_ELEMENT:
+                if (parser.getDepth() == initialDepth) {
+                    break outerloop;
+                }
+                break;
+            }
+        }
+        return option;
+    }
+
+    @Override
+    public QName getQName() {
+        return FormField.Option.QNAME;
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/RequiredProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/RequiredProvider.java
new file mode 100644
index 000000000..df0ca4a8f
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/RequiredProvider.java
@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata.provider;
+
+import java.io.IOException;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.xdata.FormField;
+
+public class RequiredProvider extends FormFieldChildElementProvider<FormField.Required> {
+
+    @Override
+    public FormField.Required parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        return FormField.Required.INSTANCE;
+    }
+
+    @Override
+    public QName getQName() {
+        return FormField.Required.QNAME;
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/ValueProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/ValueProvider.java
new file mode 100644
index 000000000..470a78d43
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/ValueProvider.java
@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata.provider;
+
+import java.io.IOException;
+
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.xdata.FormField;
+
+public class ValueProvider extends FormFieldChildElementProvider<FormField.Value> {
+
+    @Override
+    public FormField.Value parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException {
+        String value = parser.nextText();
+        return new FormField.Value(value);
+    }
+
+    @Override
+    public QName getQName() {
+        return FormField.Value.QNAME;
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/provider/DataLayoutProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/provider/DataLayoutProvider.java
index f66b23689..ff4bef1d7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/provider/DataLayoutProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/provider/DataLayoutProvider.java
@@ -19,6 +19,9 @@ package org.jivesoftware.smackx.xdatalayout.provider;
 import java.io.IOException;
 import java.util.List;
 
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.xdatalayout.packet.DataLayout;
 import org.jivesoftware.smackx.xdatalayout.packet.DataLayout.DataFormLayoutElement;
 import org.jivesoftware.smackx.xdatalayout.packet.DataLayout.Fieldref;
@@ -26,9 +29,6 @@ import org.jivesoftware.smackx.xdatalayout.packet.DataLayout.Reportedref;
 import org.jivesoftware.smackx.xdatalayout.packet.DataLayout.Section;
 import org.jivesoftware.smackx.xdatalayout.packet.DataLayout.Text;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Extension Provider for Page layout of forms.
  *
@@ -52,9 +52,9 @@ public class DataLayoutProvider {
     private static void parseLayout(List<DataFormLayoutElement> layout, XmlPullParser parser) throws XmlPullParserException, IOException {
         final int initialDepth = parser.getDepth();
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 switch (parser.getName()) {
                 case Text.ELEMENT:
                     layout.add(new Text(parser.nextText()));
@@ -72,11 +72,14 @@ public class DataLayoutProvider {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
     }
@@ -85,8 +88,8 @@ public class DataLayoutProvider {
         final int initialDepth = parser.getDepth();
         Fieldref fieldref = new Fieldref(parser.getAttributeValue("", "var"));
         outerloop: while (true) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.END_TAG && parser.getDepth() == initialDepth) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.END_ELEMENT && parser.getDepth() == initialDepth) {
                 break outerloop;
             }
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/XDataValidationManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/XDataValidationManager.java
index eeb28b2f8..60f85878e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/XDataValidationManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/XDataValidationManager.java
@@ -21,11 +21,15 @@ import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPConnectionRegistry;
 
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProviderManager;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
+import org.jivesoftware.smackx.xdatavalidation.provider.DataValidationProvider;
 
 public class XDataValidationManager {
 
     static {
+        FormFieldChildElementProviderManager.addFormFieldChildElementProvider(new DataValidationProvider());
+
         XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
             @Override
             public void connectionCreated(XMPPConnection connection) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java
index 4dc7fd62b..cf2be2b09 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java
@@ -16,13 +16,15 @@
  */
 package org.jivesoftware.smackx.xdatavalidation.packet;
 
-import org.jivesoftware.smack.packet.ExtensionElement;
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.datatypes.UInt32;
 import org.jivesoftware.smack.packet.NamedElement;
-import org.jivesoftware.smack.util.NumberUtil;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jivesoftware.smackx.xdata.FormField;
+import org.jivesoftware.smackx.xdata.FormFieldChildElement;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 import org.jivesoftware.smackx.xdatavalidation.ValidationConsistencyException;
 
@@ -34,12 +36,14 @@ import org.jivesoftware.smackx.xdatavalidation.ValidationConsistencyException;
  *
  * @author Anno van Vliet
  */
-public abstract class ValidateElement implements ExtensionElement {
+public abstract class ValidateElement implements FormFieldChildElement {
 
     public static final String DATATYPE_XS_STRING = "xs:string";
     public static final String ELEMENT = "validate";
     public static final String NAMESPACE = "http://jabber.org/protocol/xdata-validate";
 
+    public static final QName QNAME = new QName(NAMESPACE, ELEMENT);
+
     private final String datatype;
 
     private ListRange listRange;
@@ -82,9 +86,19 @@ public abstract class ValidateElement implements ExtensionElement {
         return NAMESPACE;
     }
 
+    @Override
+    public QName getQName() {
+        return QNAME;
+    }
+
+    @Override
+    public final boolean mustBeOnlyOfHisKind() {
+        return true;
+    }
+
     @Override
     public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
-        XmlStringBuilder buf = new XmlStringBuilder(this);
+        XmlStringBuilder buf = new XmlStringBuilder(this, enclosingNamespace);
         buf.optAttribute("datatype", datatype);
         buf.rightAngleBracket();
         appendXML(buf);
@@ -115,11 +129,16 @@ public abstract class ValidateElement implements ExtensionElement {
     }
 
     /**
-     * Check if this element is consistent according to the business rules in XEP=0122.
+     * Check if this element is consistent according to the business rules in XEP-0122.
      *
-     * @param formField
+     * @param formFieldBuilder the builder used to construct the form field.
      */
-    public abstract void checkConsistency(FormField formField);
+    @Override
+    public abstract void checkConsistency(FormField.Builder formFieldBuilder);
+
+    public static ValidateElement from(FormField formField) {
+        return (ValidateElement) formField.getFormFieldChildElement(QNAME);
+    }
 
     /**
      * Validation only against the datatype itself. Indicates that the value(s) should simply match the field type and
@@ -146,7 +165,7 @@ public abstract class ValidateElement implements ExtensionElement {
         }
 
         @Override
-        public void checkConsistency(FormField formField) {
+        public void checkConsistency(FormField.Builder formField) {
             checkListRangeConsistency(formField);
             if (formField.getType() != null) {
                 switch (formField.getType()) {
@@ -189,7 +208,7 @@ public abstract class ValidateElement implements ExtensionElement {
         }
 
         @Override
-        public void checkConsistency(FormField formField) {
+        public void checkConsistency(FormField.Builder formField) {
             checkListRangeConsistency(formField);
             if (formField.getType() != null) {
                 switch (formField.getType()) {
@@ -257,7 +276,7 @@ public abstract class ValidateElement implements ExtensionElement {
         }
 
         @Override
-        public void checkConsistency(FormField formField) {
+        public void checkConsistency(FormField.Builder formField) {
             checkNonMultiConsistency(formField, METHOD);
             if (getDatatype().equals(ValidateElement.DATATYPE_XS_STRING)) {
                 throw new ValidationConsistencyException(String.format(
@@ -307,7 +326,7 @@ public abstract class ValidateElement implements ExtensionElement {
         }
 
         @Override
-        public void checkConsistency(FormField formField) {
+        public void checkConsistency(FormField.Builder formField) {
             checkNonMultiConsistency(formField, METHOD);
         }
 
@@ -320,8 +339,12 @@ public abstract class ValidateElement implements ExtensionElement {
     public static class ListRange implements NamedElement {
 
         public static final String ELEMENT = "list-range";
-        private final Long min;
-        private final Long max;
+        private final UInt32 min;
+        private final UInt32 max;
+
+        public ListRange(Long min, Long max) {
+            this(min != null ? UInt32.from(min) : null, max != null ? UInt32.from(max) : null);
+        }
 
         /**
          * The 'max' attribute specifies the maximum allowable number of selected/entered values. The 'min' attribute
@@ -331,13 +354,7 @@ public abstract class ValidateElement implements ExtensionElement {
          * @param min
          * @param max
          */
-        public ListRange(Long min, Long max) {
-            if (min != null) {
-                NumberUtil.checkIfInUInt32Range(min);
-            }
-            if (max != null) {
-                NumberUtil.checkIfInUInt32Range(max);
-            }
+        public ListRange(UInt32 min, UInt32 max) {
             if (max == null && min == null) {
                 throw new IllegalArgumentException("Either min or max must be given");
             }
@@ -348,8 +365,8 @@ public abstract class ValidateElement implements ExtensionElement {
         @Override
         public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
             XmlStringBuilder buf = new XmlStringBuilder(this);
-            buf.optLongAttribute("min", getMin());
-            buf.optLongAttribute("max", getMax());
+            buf.optAttribute("min", getMin());
+            buf.optAttribute("max", getMax());
             buf.closeEmptyElement();
             return buf;
         }
@@ -364,7 +381,7 @@ public abstract class ValidateElement implements ExtensionElement {
          *
          * @return a positive integer, can be null
          */
-        public Long getMin() {
+        public UInt32 getMin() {
             return min;
         }
 
@@ -373,7 +390,7 @@ public abstract class ValidateElement implements ExtensionElement {
          *
          * @return a positive integer, can be null
          */
-        public Long getMax() {
+        public UInt32 getMax() {
             return max;
         }
 
@@ -385,14 +402,14 @@ public abstract class ValidateElement implements ExtensionElement {
      *
      * @param formField
      */
-    protected void checkListRangeConsistency(FormField formField) {
+    protected void checkListRangeConsistency(FormField.Builder formField) {
         ListRange listRange = getListRange();
         if (listRange == null) {
             return;
         }
 
-        Long max = listRange.getMax();
-        Long min = listRange.getMin();
+        Object max = listRange.getMax();
+        Object min = listRange.getMin();
         if ((max != null || min != null) && formField.getType() != FormField.Type.list_multi) {
             throw new ValidationConsistencyException(
                             "Field type is not of type 'list-multi' while a 'list-range' is defined.");
@@ -403,7 +420,7 @@ public abstract class ValidateElement implements ExtensionElement {
      * @param formField
      * @param method
      */
-    protected void checkNonMultiConsistency(FormField formField, String method) {
+    protected void checkNonMultiConsistency(FormField.Builder formField, String method) {
         checkListRangeConsistency(formField);
         if (formField.getType() != null) {
             switch (formField.getType()) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationProvider.java
index 67b82447a..3a9d18189 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationProvider.java
@@ -19,8 +19,15 @@ package org.jivesoftware.smackx.xdatavalidation.provider;
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.util.ParserUtils;
+import javax.xml.namespace.QName;
 
+import org.jivesoftware.smack.datatypes.UInt32;
+import org.jivesoftware.smack.packet.XmlEnvironment;
+import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.xdata.provider.FormFieldChildElementProvider;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.BasicValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.ListRange;
@@ -28,28 +35,26 @@ import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.OpenValida
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RangeValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RegexValidateElement;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Extension Provider for Data validation of forms.
  *
  * @author Anno van Vliet
  *
  */
-public class DataValidationProvider {
+public class DataValidationProvider extends FormFieldChildElementProvider<ValidateElement> {
     private static final Logger LOGGER = Logger.getLogger(DataValidationProvider.class.getName());
 
-    public static ValidateElement parse(XmlPullParser parser) throws XmlPullParserException, IOException {
-        final int initialDepth = parser.getDepth();
+    @Override
+    public ValidateElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
+                    throws XmlPullParserException, IOException {
         final String dataType = parser.getAttributeValue("", "datatype");
         ValidateElement dataValidation = null;
         ListRange listRange = null;
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case OpenValidateElement.METHOD:
@@ -65,11 +70,11 @@ public class DataValidationProvider {
                                     );
                     break;
                 case RegexValidateElement.METHOD:
-                    dataValidation = new RegexValidateElement(dataType,parser.nextText());
+                    dataValidation = new RegexValidateElement(dataType, parser.nextText());
                     break;
                 case ListRange.ELEMENT:
-                    Long min = ParserUtils.getLongAttribute(parser, "min");
-                    Long max = ParserUtils.getLongAttribute(parser, "max");
+                    UInt32 min = ParserUtils.getUInt32Attribute(parser, "min");
+                    UInt32 max = ParserUtils.getUInt32Attribute(parser, "max");
                     if (min != null || max != null) {
                         listRange = new ListRange(min, max);
                     } else {
@@ -80,7 +85,7 @@ public class DataValidationProvider {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     if (dataValidation == null) {
                         // XEP-122 § 3.2 states that "If no validation method is specified,
@@ -91,9 +96,17 @@ public class DataValidationProvider {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return dataValidation;
     }
 
+    @Override
+    public QName getQName() {
+        return ValidateElement.QNAME;
+    }
+
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java
index b08507ad0..2ef66949f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java
@@ -105,7 +105,7 @@ public class XHTMLText {
     private XHTMLText appendOpenBodyTag(String style, String lang) {
         text.halfOpenElement(Message.BODY);
         text.xmlnsAttribute(NAMESPACE);
-        text.optElement(STYLE, style);
+        text.optAttribute(STYLE, style);
         text.xmllangAttribute(lang);
         text.rightAngleBracket();
         return this;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java
index 6335daedb..71f15fe53 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2014 Florian Schmaus
+ * Copyright 2003-2007 Jive Software, 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,11 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * The XHTMLExtensionProvider parses XHTML packets.
  *
@@ -40,13 +39,13 @@ public class XHTMLExtensionProvider extends ExtensionElementProvider<XHTMLExtens
         XHTMLExtension xhtmlExtension = new XHTMLExtension();
 
         while (true) {
-            int eventType = parser.getEventType();
+            XmlPullParser.Event eventType = parser.getEventType();
             String name = parser.getName();
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (name.equals(Message.BODY)) {
                     xhtmlExtension.addBody(PacketParserUtils.parseElement(parser));
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getDepth() == initialDepth) {
                     return xhtmlExtension;
                 }
diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml
index fd878518a..d234bb5b3 100644
--- a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml
+++ b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml
@@ -2,6 +2,7 @@
     <startupClasses>
         <className>org.jivesoftware.smackx.disco.ServiceDiscoveryManager</className>
         <className>org.jivesoftware.smackx.xhtmlim.XHTMLManager</className>
+        <className>org.jivesoftware.smackx.mediaelement.MediaElementManager</className>
         <className>org.jivesoftware.smackx.muc.MultiUserChatManager</className>
         <className>org.jivesoftware.smackx.muc.bookmarkautojoin.MucBookmarkAutojoinManager</className>
         <className>org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager</className>
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java
index f586b3b81..e3df90948 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java
@@ -24,14 +24,14 @@ import java.io.InputStream;
 import java.nio.charset.Charset;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
+import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.amp.packet.AMPExtension;
 import org.jivesoftware.smackx.amp.provider.AMPExtensionProvider;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserFactory;
 
 public class AMPExtensionTest {
 
@@ -65,11 +65,9 @@ public class AMPExtensionTest {
     @Test
     public void isCorrectFromXmlErrorHandling() throws Exception {
         AMPExtensionProvider ampProvider = new AMPExtensionProvider();
-        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        parser.setInput(INCORRECT_RECEIVING_STANZA_STREAM, "UTF-8");
+        XmlPullParser parser = PacketParserUtils.getParserFor(INCORRECT_RECEIVING_STANZA_STREAM);
 
-        assertEquals(XmlPullParser.START_TAG, parser.next());
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
         assertEquals(AMPExtension.ELEMENT, parser.getName());
 
         ExtensionElement extension = ampProvider.parse(parser);
@@ -85,11 +83,9 @@ public class AMPExtensionTest {
     @Test
     public void isCorrectFromXmlDeserialization() throws Exception {
         AMPExtensionProvider ampProvider = new AMPExtensionProvider();
-        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        parser.setInput(CORRECT_SENDING_STANZA_STREAM, "UTF-8");
+        XmlPullParser parser = PacketParserUtils.getParserFor(CORRECT_SENDING_STANZA_STREAM);
 
-        assertEquals(XmlPullParser.START_TAG, parser.next());
+        assertEquals(XmlPullParser.Event.START_ELEMENT, parser.next());
         assertEquals(AMPExtension.ELEMENT, parser.getName());
         ExtensionElement extension = ampProvider.parse(parser);
         assertTrue(extension instanceof AMPExtension);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
index f6bcafc7a..c93409e4f 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.blocking;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,7 +26,6 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.blocking.element.BlockContactsIQ;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
@@ -47,15 +48,15 @@ public class BlockContactsIQTest {
         BlockContactsIQ blockContactIQ = new BlockContactsIQ(jids);
         blockContactIQ.setStanzaId("block1");
 
-        Assert.assertEquals(blockContactIQExample, blockContactIQ.toXML().toString());
+        assertEquals(blockContactIQExample, blockContactIQ.toXML().toString());
     }
 
     @Test
     public void checkBlockContactPushIQ() throws Exception {
         IQ iq = PacketParserUtils.parseStanza(blockContactPushIQExample);
         BlockContactsIQ blockContactIQ = (BlockContactsIQ) iq;
-        Assert.assertEquals(JidCreate.from("romeo@montague.net"), blockContactIQ.getJids().get(0));
-        Assert.assertEquals(JidCreate.from("pepe@montague.net"), blockContactIQ.getJids().get(1));
+        assertEquals(JidCreate.from("romeo@montague.net"), blockContactIQ.getJids().get(0));
+        assertEquals(JidCreate.from("pepe@montague.net"), blockContactIQ.getJids().get(1));
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java
index 36fa027c5..31e4c0abf 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockedErrorExtensionTest.java
@@ -16,12 +16,14 @@
  */
 package org.jivesoftware.smackx.blocking;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.blocking.element.BlockedErrorExtension;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 public class BlockedErrorExtensionTest {
@@ -44,13 +46,13 @@ public class BlockedErrorExtensionTest {
     @Test
     public void checkErrorHasBlockedExtension() throws Exception {
         Message message1 = PacketParserUtils.parseStanza(messageWithoutError);
-        Assert.assertFalse(BlockedErrorExtension.isInside(message1));
+        assertFalse(BlockedErrorExtension.isInside(message1));
 
         Message message2 = PacketParserUtils.parseStanza(messageWithError);
-        Assert.assertFalse(BlockedErrorExtension.isInside(message2));
+        assertFalse(BlockedErrorExtension.isInside(message2));
 
         Message message3 = PacketParserUtils.parseStanza(messageWithBlockedError);
-        Assert.assertTrue(BlockedErrorExtension.isInside(message3));
+        assertTrue(BlockedErrorExtension.isInside(message3));
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
index cfa26583d..bf55ee0ea 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java
@@ -16,6 +16,8 @@
  */
 package org.jivesoftware.smackx.blocking;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.StreamOpen;
@@ -23,7 +25,6 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.blocking.element.BlockListIQ;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
@@ -43,20 +44,20 @@ public class GetBlockingListTest {
         BlockListIQ getBlockListIQ = new BlockListIQ(null);
         getBlockListIQ.setType(Type.get);
         getBlockListIQ.setStanzaId("blocklist1");
-        Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(getBlockingListIQExample, getBlockListIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void checkBlockListIQ() throws Exception {
         IQ iq = PacketParserUtils.parseStanza(blockListIQExample);
         BlockListIQ blockListIQ = (BlockListIQ) iq;
-        Assert.assertEquals(2, blockListIQ.getBlockedJids().size());
-        Assert.assertEquals(JidCreate.from("romeo@montague.net"), blockListIQ.getBlockedJids().get(0));
-        Assert.assertEquals(JidCreate.from("iago@shakespeare.lit"), blockListIQ.getBlockedJids().get(1));
+        assertEquals(2, blockListIQ.getBlockedJids().size());
+        assertEquals(JidCreate.from("romeo@montague.net"), blockListIQ.getBlockedJids().get(0));
+        assertEquals(JidCreate.from("iago@shakespeare.lit"), blockListIQ.getBlockedJids().get(1));
 
         IQ iq2 = PacketParserUtils.parseStanza(emptyBlockListIQExample);
         BlockListIQ emptyBlockListIQ = (BlockListIQ) iq2;
-        Assert.assertEquals(0, emptyBlockListIQ.getBlockedJids().size());
+        assertEquals(0, emptyBlockListIQ.getBlockedJids().size());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
index d7b72fe56..58489395c 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java
@@ -16,6 +16,9 @@
  */
 package org.jivesoftware.smackx.blocking;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +28,6 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.blocking.element.UnblockContactsIQ;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
@@ -54,29 +56,29 @@ public class UnblockContactsIQTest {
         UnblockContactsIQ unblockContactIQ = new UnblockContactsIQ(jids);
         unblockContactIQ.setStanzaId("unblock1");
 
-        Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(unblockContactIQExample, unblockContactIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void checkUnblockContactPushIQ() throws Exception {
         IQ iq = PacketParserUtils.parseStanza(unblockContactPushIQExample);
         UnblockContactsIQ unblockContactIQ = (UnblockContactsIQ) iq;
-        Assert.assertEquals(JidCreate.from("romeo@montague.net"), unblockContactIQ.getJids().get(0));
-        Assert.assertEquals(JidCreate.from("pepe@montague.net"), unblockContactIQ.getJids().get(1));
+        assertEquals(JidCreate.from("romeo@montague.net"), unblockContactIQ.getJids().get(0));
+        assertEquals(JidCreate.from("pepe@montague.net"), unblockContactIQ.getJids().get(1));
     }
 
     @Test
     public void checkUnblockAllIQStanza() throws Exception {
         UnblockContactsIQ unblockAllIQ = new UnblockContactsIQ(null);
         unblockAllIQ.setStanzaId("unblock2");
-        Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(unblockAllIQExample, unblockAllIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
     public void checkUnblockAllPushIQ() throws Exception {
         IQ iq = PacketParserUtils.parseStanza(unblockAllPushIQExample);
         UnblockContactsIQ unblockAllIQ = (UnblockContactsIQ) iq;
-        Assert.assertNull(unblockAllIQ.getJids());
+        assertNull(unblockAllIQ.getJids());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
index 849e6350c..a1c27386e 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java
@@ -16,15 +16,17 @@
  */
 package org.jivesoftware.smackx.bob;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.charset.StandardCharsets;
+
 import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.packet.StreamOpen;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
-import org.jivesoftware.smack.util.StringUtils;
 
 import org.jivesoftware.smackx.bob.element.BoBIQ;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.jxmpp.jid.impl.JidCreate;
 
@@ -46,7 +48,7 @@ public class BoBIQTest extends SmackTestSuite {
         createdBoBIQ.setTo(JidCreate.from("ladymacbeth@shakespeare.lit/castle"));
         createdBoBIQ.setType(Type.get);
 
-        Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
     @Test
@@ -54,19 +56,19 @@ public class BoBIQTest extends SmackTestSuite {
         BoBIQ bobIQ = PacketParserUtils.parseStanza(sampleBoBIQResponse);
 
         BoBHash bobHash = new BoBHash("8f35fef110ffc5df08d579a50083ff9308fb6242", "sha1");
-        BoBData bobData = new BoBData("image/png", "sarasade2354j2".getBytes(StringUtils.UTF8), 86400);
+        BoBData bobData = new BoBData("image/png", "sarasade2354j2".getBytes(StandardCharsets.UTF_8), 86400);
 
         BoBIQ createdBoBIQ = new BoBIQ(bobHash, bobData);
         createdBoBIQ.setStanzaId("sarasa");
         createdBoBIQ.setTo(JidCreate.from("doctor@shakespeare.lit/pda"));
         createdBoBIQ.setType(Type.result);
 
-        Assert.assertEquals(bobIQ.getBoBHash().getHash(), createdBoBIQ.getBoBHash().getHash());
-        Assert.assertEquals(bobIQ.getBoBHash().getHashType(), createdBoBIQ.getBoBHash().getHashType());
-        Assert.assertEquals(bobIQ.getBoBData().getMaxAge(), createdBoBIQ.getBoBData().getMaxAge());
-        Assert.assertEquals(bobIQ.getBoBData().getType(), createdBoBIQ.getBoBData().getType());
-        Assert.assertEquals(bobIQ.getBoBData().getContentBase64Encoded(), createdBoBIQ.getBoBData().getContentBase64Encoded());
-        Assert.assertEquals(bobIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), createdBoBIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertEquals(bobIQ.getBoBHash().getHash(), createdBoBIQ.getBoBHash().getHash());
+        assertEquals(bobIQ.getBoBHash().getHashType(), createdBoBIQ.getBoBHash().getHashType());
+        assertEquals(bobIQ.getBoBData().getMaxAge(), createdBoBIQ.getBoBData().getMaxAge());
+        assertEquals(bobIQ.getBoBData().getType(), createdBoBIQ.getBoBData().getType());
+        assertEquals(bobIQ.getBoBData().getContentBase64Encoded(), createdBoBIQ.getBoBData().getContentBase64Encoded());
+        assertEquals(bobIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString(), createdBoBIQ.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
index 5df280e0a..f4c2f7be8 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
@@ -69,8 +69,6 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
     // mocked XMPP connection
     private XMPPConnection connection;
 
-    private InBandBytestreamManager byteStreamManager;
-
     private Open initBytestream;
 
     private Verification<Message, IQ> incrementingSequence;
@@ -90,9 +88,6 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
         // create mocked XMPP connection
         connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
 
-        // initialize InBandBytestreamManager to get the InitiationListener
-        byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
-
         // create a In-Band Bytestream open packet with message stanza
         initBytestream = new Open(sessionID, blockSize, StanzaType.MESSAGE);
         initBytestream.setFrom(initiatorJID);
@@ -318,7 +313,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
         }
 
         byte[] bytes = new byte[3 * blockSize];
-        int read = 0;
+        int read;
         read = inputStream.read(bytes, 0, blockSize);
         assertEquals(blockSize, read);
         read = inputStream.read(bytes, 10, blockSize);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
index b19c9cc44..477859996 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
@@ -70,8 +70,6 @@ public class InBandBytestreamSessionTest extends InitExtensions {
     // mocked XMPP connection
     private XMPPConnection connection;
 
-    private InBandBytestreamManager byteStreamManager;
-
     private Open initBytestream;
 
     private Verification<Data, IQ> incrementingSequence;
@@ -91,9 +89,6 @@ public class InBandBytestreamSessionTest extends InitExtensions {
         // create mocked XMPP connection
         connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
 
-        // initialize InBandBytestreamManager to get the InitiationListener
-        byteStreamManager = InBandBytestreamManager.getByteStreamManager(connection);
-
         // create a In-Band Bytestream open packet
         initBytestream = new Open(sessionID, blockSize);
         initBytestream.setFrom(initiatorJID);
@@ -512,7 +507,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
         }
 
         byte[] bytes = new byte[3 * blockSize];
-        int read = 0;
+        int read;
         read = inputStream.read(bytes, 0, blockSize);
         assertEquals(blockSize, read);
         read = inputStream.read(bytes, 10, blockSize);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
index 4adb4857b..f43c0e365 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Properties;
@@ -81,7 +81,7 @@ public class CloseTest extends InitExtensions {
         close.setTo(JidCreate.from("juliet@capulet.lit/balcony"));
         close.setStanzaId("us71g45j");
 
-        assertXMLEqual(control, close.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, close.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
index f29e15e49..b5afeb197 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
@@ -16,15 +16,13 @@
  */
 package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
-import org.jivesoftware.smack.util.StringUtils;
-
 import org.jivesoftware.smackx.InitExtensions;
 
 import com.jamesmurty.utils.XMLBuilder;
@@ -71,13 +69,13 @@ public class DataPacketExtensionTest extends InitExtensions {
     }
 
     @Test
-    public void shouldReturnNullIfDataIsInvalid() throws UnsupportedEncodingException {
+    public void shouldReturnNullIfDataIsInvalid() {
         // pad character is not at end of data
         DataPacketExtension data = new DataPacketExtension("sessionID", 0, "BBBB=CCC");
         assertNull(data.getDecodedData());
 
         // invalid Base64 character
-        data = new DataPacketExtension("sessionID", 0, new String(new byte[] { 123 }, StringUtils.UTF8));
+        data = new DataPacketExtension("sessionID", 0, new String(new byte[] { 123 }, StandardCharsets.UTF_8));
         assertNull(data.getDecodedData());
     }
 
@@ -96,7 +94,7 @@ public class DataPacketExtensionTest extends InitExtensions {
             .asString(outputProperties);
 
         DataPacketExtension data = new DataPacketExtension("i781hf64", 0, "DATA");
-        assertXMLEqual(control, data.toXML().toString());
+        assertXmlSimilar(control, data.toXML().toString());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
index ea53cf94c..974033a49 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
@@ -78,7 +78,7 @@ public class DataTest extends InitExtensions {
         data.setTo(JidCreate.from("juliet@capulet.lit/balcony"));
         data.setStanzaId("kr91n475");
 
-        assertXMLEqual(control, data.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, data.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
index 730035ced..611c68894 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.bytestreams.ibb.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 
 import java.util.Properties;
@@ -103,7 +103,7 @@ public class OpenTest extends InitExtensions {
         open.setTo(JidCreate.from("juliet@capulet.lit/balcony"));
         open.setStanzaId("jn3h8g65");
 
-        assertXMLEqual(control, open.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
+        assertXmlSimilar(control, open.toXML(StreamOpen.CLIENT_NAMESPACE).toString());
     }
 
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
index 2be5622b1..eee489e47 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import java.util.Properties;
 
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
@@ -28,7 +29,6 @@ import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Test for the OpenIQProvider class.
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
index 5db3fd84d..f059ab2ab 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
@@ -50,7 +50,6 @@ public class InitiationListenerTest {
 
     private static final EntityFullJid initiatorJID = JidTestUtil.DUMMY_AT_EXAMPLE_ORG_SLASH_DUMMYRESOURCE;
     private static final EntityFullJid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
-    private static final DomainBareJid xmppServer = JidTestUtil.DOMAIN_BARE_JID_1;
     private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
     private static final String proxyAddress = "127.0.0.1";
     private static final String sessionID = "session_id";
@@ -227,7 +226,6 @@ public class InitiationListenerTest {
      */
     @Test
     public void shouldInvokeAllRequestsListenerIfUserListenerExists() throws Exception {
-
         // add listener for all request
         Socks5BytestreamListener allRequestsListener = mock(Socks5BytestreamListener.class);
         byteStreamManager.addIncomingBytestreamListener(allRequestsListener);
@@ -241,15 +239,11 @@ public class InitiationListenerTest {
         initiationListener.handleIQRequest(initBytestream);
 
         ArgumentCaptor<BytestreamRequest> byteStreamRequest = ArgumentCaptor.forClass(BytestreamRequest.class);
-
         // assert all requests listener is called
-        byteStreamRequest = ArgumentCaptor.forClass(BytestreamRequest.class);
         verify(allRequestsListener, timeout(TIMEOUT)).incomingBytestreamRequest(byteStreamRequest.capture());
 
         // assert user request listener is not called
         verify(userRequestsListener, never()).incomingBytestreamRequest(byteStreamRequest.capture());
-
-
     }
 
     /**
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
index aec522ead..0564f29f2 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
@@ -22,12 +22,17 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.FeatureNotSupportedException;
@@ -37,6 +42,8 @@ import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.ErrorIQ;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.util.ExceptionUtil;
+import org.jivesoftware.smack.util.NetworkUtil;
 
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
@@ -49,8 +56,6 @@ import org.jivesoftware.smackx.disco.packet.DiscoverItems.Item;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityFullJid;
@@ -71,30 +76,6 @@ public class Socks5ByteStreamManagerTest {
     private static final DomainBareJid xmppServer = initiatorJID.asDomainBareJid();
     private static final DomainBareJid proxyJID = JidTestUtil.MUC_EXAMPLE_ORG;
     private static final String proxyAddress = "127.0.0.1";
-    private static final String sessionID = "session_id";
-
-    // protocol verifier
-    private Protocol protocol;
-
-    // mocked XMPP connection
-    private XMPPConnection connection;
-
-    /**
-     * Initialize fields used in the tests.
-     * @throws XMPPException
-     * @throws SmackException
-     * @throws InterruptedException
-     */
-    @Before
-    public void setup() throws XMPPException, SmackException, InterruptedException {
-
-        // build protocol verifier
-        protocol = new Protocol();
-
-        // create mocked XMPP connection
-        connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
-
-    }
 
     /**
      * Test that {@link Socks5BytestreamManager#getBytestreamManager(XMPPConnection)} returns one
@@ -102,7 +83,6 @@ public class Socks5ByteStreamManagerTest {
      */
     @Test
     public void shouldHaveOneManagerForEveryConnection() {
-
         // mock two connections
         XMPPConnection connection1 = mock(XMPPConnection.class);
         XMPPConnection connection2 = mock(XMPPConnection.class);
@@ -124,15 +104,21 @@ public class Socks5ByteStreamManagerTest {
         // assertions
         assertEquals(conn1ByteStreamManager1, conn1ByteStreamManager2);
         assertNotSame(conn1ByteStreamManager1, conn2ByteStreamManager1);
-
     }
 
     /**
      * The SOCKS5 Bytestream feature should be removed form the service discovery manager if Socks5
      * bytestream feature is disabled.
+     *
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPErrorException
      */
     @Test
-    public void shouldDisableService() {
+    public void shouldDisableService() throws XMPPErrorException, SmackException, InterruptedException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
         ServiceDiscoveryManager discoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
 
@@ -147,42 +133,48 @@ public class Socks5ByteStreamManagerTest {
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid)} should throw an exception
      * if the given target does not support SOCKS5 Bytestream.
      * @throws XMPPException
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws IOException
      */
     @Test
-    public void shouldFailIfTargetDoesNotSupportSocks5() throws XMPPException {
+    public void shouldFailIfTargetDoesNotSupportSocks5()
+                    throws XMPPException, SmackException, InterruptedException, IOException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
 
-        try {
+        FeatureNotSupportedException e = assertThrows(FeatureNotSupportedException.class, () -> {
             // build empty discover info as reply if targets features are queried
             DiscoverInfo discoverInfo = new DiscoverInfo();
             protocol.addResponse(discoverInfo);
 
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID);
+        });
 
-            fail("exception should be thrown");
-        }
-        catch (FeatureNotSupportedException e) {
-            assertTrue(e.getFeature().equals("SOCKS5 Bytestream"));
-            assertTrue(e.getJid().equals(targetJID));
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-
+        assertTrue(e.getFeature().equals("SOCKS5 Bytestream"));
+        assertTrue(e.getJid().equals(targetJID));
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should fail if XMPP
      * server doesn't return any proxies.
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      */
     @Test
-    public void shouldFailIfNoSocks5ProxyFound1() {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldFailIfNoSocks5ProxyFound1()
+                    throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldFailIfNoSocks5ProxyFound1";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -205,35 +197,36 @@ public class Socks5ByteStreamManagerTest {
         protocol.addResponse(discoverItems, Verification.correspondingSenderReceiver,
                         Verification.requestTypeGET);
 
-        try {
-
+        SmackException e = assertThrows(SmackException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
 
             fail("exception should be thrown");
-        }
-        catch (SmackException e) {
-            protocol.verifyAll();
-            assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
+        });
 
+        protocol.verifyAll();
+        assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should fail if no
      * proxy is a SOCKS5 proxy.
+     *
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      */
     @Test
-    public void shouldFailIfNoSocks5ProxyFound2() {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldFailIfNoSocks5ProxyFound2()
+                    throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldFailIfNoSocks5ProxyFound2";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -268,36 +261,33 @@ public class Socks5ByteStreamManagerTest {
         protocol.addResponse(proxyInfo, Verification.correspondingSenderReceiver,
                         Verification.requestTypeGET);
 
-        try {
-
+        SmackException e = assertThrows(SmackException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
+        });
 
-            fail("exception should be thrown");
-        }
-        catch (SmackException e) {
-            protocol.verifyAll();
-            assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
-
+        protocol.verifyAll();
+        assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should fail if no
      * SOCKS5 proxy can be found. If it turns out that a proxy is not a SOCKS5 proxy it should not
      * be queried again.
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      */
     @Test
-    public void shouldBlacklistNonSocks5Proxies() {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldBlacklistNonSocks5Proxies() throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldBlacklistNonSocks5Proxies";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -332,20 +322,15 @@ public class Socks5ByteStreamManagerTest {
         protocol.addResponse(proxyInfo, Verification.correspondingSenderReceiver,
                         Verification.requestTypeGET);
 
-        try {
-
+        SmackException e = assertThrows(SmackException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
 
             fail("exception should be thrown");
-        }
-        catch (SmackException e) {
-            protocol.verifyAll();
-            assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
+        });
+
+        protocol.verifyAll();
+        assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
 
         /* retry to establish SOCKS5 Bytestream */
 
@@ -355,40 +340,36 @@ public class Socks5ByteStreamManagerTest {
         protocol.addResponse(discoverItems, Verification.correspondingSenderReceiver,
                         Verification.requestTypeGET);
 
-        try {
-
+        e = assertThrows(SmackException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
-
-            fail("exception should be thrown");
-        }
-        catch (SmackException e) {
-            /*
-             * #verifyAll() tests if the number of requests and responses corresponds and should
-             * fail if the invalid proxy is queried again
-             */
-            protocol.verifyAll();
-            assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
-
+        });
+        /*
+         * #verifyAll() tests if the number of requests and responses corresponds and should
+         * fail if the invalid proxy is queried again
+         */
+        protocol.verifyAll();
+        assertTrue(e.getMessage().contains("no SOCKS5 proxies available"));
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should fail if the
      * target does not accept a SOCKS5 Bytestream. See <a
      * href="http://xmpp.org/extensions/xep-0065.html#usecase-alternate">XEP-0065 Section 5.2 A2</a>
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      */
     @Test
-    public void shouldFailIfTargetDoesNotAcceptSocks5Bytestream() {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldFailIfTargetDoesNotAcceptSocks5Bytestream() throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldFailIfTargetDoesNotAcceptSocks5Bytestream";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -442,36 +423,35 @@ public class Socks5ByteStreamManagerTest {
         protocol.addResponse(rejectPacket, Verification.correspondingSenderReceiver,
                         Verification.requestTypeSET);
 
-        try {
-
+        XMPPErrorException e = assertThrows(XMPPErrorException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
+        });
 
-            fail("exception should be thrown");
-        }
-        catch (XMPPErrorException e) {
-            protocol.verifyAll();
-            assertEquals(rejectPacket.getError(), e.getStanzaError());
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
-
+        protocol.verifyAll();
+        assertEquals(rejectPacket.getError(), e.getStanzaError());
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should fail if the
      * proxy used by target is invalid.
-     * @throws XmppStringprepException
+     *
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      */
     @Test
-    public void shouldFailIfTargetUsesInvalidSocks5Proxy() throws XmppStringprepException {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldFailIfTargetUsesInvalidSocks5Proxy()
+                    throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldFailIfTargetUsesInvalidSocks5Proxy";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        // TODO: It appears that it is not required to disable the local stream host for this unit test.
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -525,35 +505,33 @@ public class Socks5ByteStreamManagerTest {
         protocol.addResponse(streamHostUsedPacket, Verification.correspondingSenderReceiver,
                         Verification.requestTypeSET);
 
-        try {
-
+        SmackException e = assertThrows(SmackException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
+        });
 
-            fail("exception should be thrown");
-        }
-        catch (SmackException e) {
-            protocol.verifyAll();
-            assertTrue(e.getMessage().contains("Remote user responded with unknown host"));
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
-
+        protocol.verifyAll();
+        assertTrue(e.getMessage().contains("Remote user responded with unknown host"));
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should fail if
      * initiator can not connect to the SOCKS5 proxy used by target.
+     *
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
      */
     @Test
-    public void shouldFailIfInitiatorCannotConnectToSocks5Proxy() {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldFailIfInitiatorCannotConnectToSocks5Proxy()
+                    throws SmackException, InterruptedException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldFailIfInitiatorCannotConnectToSocks5Proxy";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -617,38 +595,36 @@ public class Socks5ByteStreamManagerTest {
 
         }, Verification.correspondingSenderReceiver, Verification.requestTypeSET);
 
-        try {
-
+        IOException e = assertThrows(IOException.class, () -> {
             // start SOCKS5 Bytestream
             byteStreamManager.establishSession(targetJID, sessionID);
+        });
 
-            fail("exception should be thrown");
-        }
-        catch (IOException e) {
-            // initiator can't connect to proxy because it is not running
-            protocol.verifyAll();
-            assertEquals(ConnectException.class, e.getClass());
-        }
-        catch (Exception e) {
-            fail(e.getMessage());
-        }
-
+        // initiator can't connect to proxy because it is not running
+        protocol.verifyAll();
+        Throwable actualCause = e.getCause().getCause();
+        assertEquals("Unexpected throwable: " + actualCause + '.' + ExceptionUtil.getStackTrace(actualCause), ConnectException.class, actualCause.getClass());
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} should successfully
      * negotiate and return a SOCKS5 Bytestream connection.
      *
-     * @throws Exception should not happen
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      */
     @Test
-    public void shouldNegotiateSocks5BytestreamAndTransferData() throws Exception {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldNegotiateSocks5BytestreamAndTransferData()
+                    throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldNegotiateSocks5BytestreamAndTransferData";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         /**
          * create responses in the order they should be queried specified by the XEP-0065
@@ -684,9 +660,10 @@ public class Socks5ByteStreamManagerTest {
 
         // build a socks5 stream host info containing the address and the port of the
         // proxy
+        ServerSocket proxyServerSocket = NetworkUtil.getSocketOnLoopback();
         Bytestream streamHostInfo = Socks5PacketUtils.createBytestreamResponse(proxyJID,
                         initiatorJID);
-        streamHostInfo.addStreamHost(proxyJID, proxyAddress, 7778);
+        streamHostInfo.addStreamHost(proxyJID, proxyAddress, proxyServerSocket.getLocalPort());
 
         // return stream host info if it is queried
         protocol.addResponse(streamHostInfo, Verification.correspondingSenderReceiver,
@@ -726,143 +703,154 @@ public class Socks5ByteStreamManagerTest {
         }, Verification.correspondingSenderReceiver, Verification.requestTypeSET);
 
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(7778);
-        socks5Proxy.start();
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy(proxyServerSocket)) {
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // finally call the method that should be tested
-        OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
+            // finally call the method that should be tested
+            OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
 
-        // test the established bytestream
-        InputStream inputStream = socks5Proxy.getSocket(digest).getInputStream();
+            // test the established bytestream
+            InputStream inputStream = socks5Proxy.getSocket(digest).getInputStream();
 
-        byte[] data = new byte[] { 1, 2, 3 };
-        outputStream.write(data);
+            byte[] data = new byte[] { 1, 2, 3 };
+            outputStream.write(data);
 
-        byte[] result = new byte[3];
-        inputStream.read(result);
+            byte[] result = new byte[3];
+            inputStream.read(result);
 
-        assertArrayEquals(data, result);
+            assertArrayEquals(data, result);
+        }
 
         protocol.verifyAll();
-
     }
 
     /**
      * If multiple network addresses are added to the local SOCKS5 proxy, all of them should be
      * contained in the SOCKS5 Bytestream request.
      *
-     * @throws Exception should not happen
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws IOException
+     * @throws XMPPException
+     * @throws TimeoutException
      */
     @Test
-    public void shouldUseMultipleAddressesForLocalSocks5Proxy() throws Exception {
-
-        // enable clients local SOCKS5 proxy on port 7778
-        Socks5Proxy.setLocalSocks5ProxyEnabled(true);
-        Socks5Proxy.setLocalSocks5ProxyPort(7778);
+    public void shouldUseMultipleAddressesForLocalSocks5Proxy()
+                    throws SmackException, InterruptedException, IOException, TimeoutException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldUseMultipleAddressesForLocalSocks5Proxy";
 
         // start a local SOCKS5 proxy
-        Socks5Proxy socks5Proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy socks5Proxy = new Socks5Proxy();
         socks5Proxy.start();
-        assertTrue(socks5Proxy.isRunning());
+        try {
+            assertTrue(socks5Proxy.isRunning());
 
-        // get Socks5ByteStreamManager for connection
-        Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+            // get Socks5ByteStreamManager for connection
+            Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
 
-        /**
-         * create responses in the order they should be queried specified by the XEP-0065
-         * specification
-         */
+            /**
+             * create responses in the order they should be queried specified by the XEP-0065
+             * specification
+             */
 
-        // build discover info that supports the SOCKS5 feature
-        DiscoverInfo discoverInfo = Socks5PacketUtils.createDiscoverInfo(targetJID, initiatorJID);
-        discoverInfo.addFeature(Bytestream.NAMESPACE);
+            // build discover info that supports the SOCKS5 feature
+            DiscoverInfo discoverInfo = Socks5PacketUtils.createDiscoverInfo(targetJID, initiatorJID);
+            discoverInfo.addFeature(Bytestream.NAMESPACE);
 
-        // return that SOCKS5 is supported if target is queried
-        protocol.addResponse(discoverInfo, Verification.correspondingSenderReceiver,
-                        Verification.requestTypeGET);
+            // return that SOCKS5 is supported if target is queried
+            protocol.addResponse(discoverInfo, Verification.correspondingSenderReceiver,
+                            Verification.requestTypeGET);
 
-        // build discover items containing no proxy item
-        DiscoverItems discoverItems = Socks5PacketUtils.createDiscoverItems(xmppServer,
-                        initiatorJID);
+            // build discover items containing no proxy item
+            DiscoverItems discoverItems = Socks5PacketUtils.createDiscoverItems(xmppServer,
+                            initiatorJID);
 
-        // return the discover item if XMPP server is queried
-        protocol.addResponse(discoverItems, Verification.correspondingSenderReceiver,
-                        Verification.requestTypeGET);
+            // return the discover item if XMPP server is queried
+            protocol.addResponse(discoverItems, Verification.correspondingSenderReceiver,
+                            Verification.requestTypeGET);
 
-        // build used stream host response
-        Bytestream streamHostUsedPacket = Socks5PacketUtils.createBytestreamResponse(targetJID,
-                        initiatorJID);
-        streamHostUsedPacket.setSessionID(sessionID);
-        streamHostUsedPacket.setUsedHost(initiatorJID); // local proxy used
+            // build used stream host response
+            Bytestream streamHostUsedPacket = Socks5PacketUtils.createBytestreamResponse(targetJID,
+                            initiatorJID);
+            streamHostUsedPacket.setSessionID(sessionID);
+            streamHostUsedPacket.setUsedHost(initiatorJID); // local proxy used
 
-        // return used stream host info as response to the bytestream initiation
-        protocol.addResponse(streamHostUsedPacket, new Verification<Bytestream, Bytestream>() {
+            final String secondStreamHostIp = "192.0.0.1";
+            // return used stream host info as response to the bytestream initiation
+            protocol.addResponse(streamHostUsedPacket, new Verification<Bytestream, Bytestream>() {
+                @Override
+                public void verify(Bytestream request, Bytestream response) {
+                    assertEquals(response.getSessionID(), request.getSessionID());
 
-            @Override
-            public void verify(Bytestream request, Bytestream response) {
-                assertEquals(response.getSessionID(), request.getSessionID());
-                StreamHost streamHost1 = request.getStreamHosts().get(0);
-                assertEquals(response.getUsedHost().getJID(), streamHost1.getJID());
-                StreamHost streamHost2 = request.getStreamHosts().get(request.getStreamHosts().size() - 1);
-                assertEquals(response.getUsedHost().getJID(), streamHost2.getJID());
-                assertEquals("localAddress", streamHost2.getAddress());
-            }
+                    List<StreamHost> streamHosts = request.getStreamHosts();
 
-        }, Verification.correspondingSenderReceiver, Verification.requestTypeSET);
+                    StreamHost streamHost1 = streamHosts.get(0);
+                    assertEquals(response.getUsedHost().getJID(), streamHost1.getJID());
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+                    // Get the last stream host. Note that there may be multiple, but since this unit test added
+                    // secondStreamHostIp as last, it should also be the last entry since the API contract assures that
+                    // the order is preserved.
+                    StreamHost streamHost2 = streamHosts.get(streamHosts.size() - 1);
+                    assertEquals(response.getUsedHost().getJID(), streamHost2.getJID());
+                    assertEquals(secondStreamHostIp, streamHost2.getAddress().toString());
+                }
+            }, Verification.correspondingSenderReceiver, Verification.requestTypeSET);
 
-        // connect to proxy as target
-        socks5Proxy.addTransfer(digest);
-        StreamHost streamHost = new StreamHost(targetJID,
-                        socks5Proxy.getLocalAddresses().get(0),
-                        socks5Proxy.getPort());
-        Socks5Client socks5Client = new Socks5Client(streamHost, digest);
-        InputStream inputStream = socks5Client.getSocket(2000).getInputStream();
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // add another network address before establishing SOCKS5 Bytestream
-        socks5Proxy.addLocalAddress("localAddress");
+            // connect to proxy as target
+            socks5Proxy.addTransfer(digest);
+            StreamHost streamHost = new StreamHost(targetJID,
+                            socks5Proxy.getLocalAddresses().get(0),
+                            socks5Proxy.getPort());
+            Socks5Client socks5Client = new Socks5Client(streamHost, digest);
+            InputStream inputStream = socks5Client.getSocket(10000).getInputStream();
 
-        // finally call the method that should be tested
-        OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
+            // add another network address before establishing SOCKS5 Bytestream
+            socks5Proxy.addLocalAddress(InetAddress.getByName(secondStreamHostIp));
 
-        // test the established bytestream
-        byte[] data = new byte[] { 1, 2, 3 };
-        outputStream.write(data);
+            // finally call the method that should be tested
+            OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
 
-        byte[] result = new byte[3];
-        inputStream.read(result);
+            // test the established bytestream
+            byte[] data = new byte[] { 1, 2, 3 };
+            outputStream.write(data);
 
-        assertArrayEquals(data, result);
+            byte[] result = new byte[3];
+            inputStream.read(result);
 
-        protocol.verifyAll();
-
-        // reset proxy settings
-        socks5Proxy.stop();
-        socks5Proxy.removeLocalAddress("localAddress");
-        Socks5Proxy.setLocalSocks5ProxyPort(7777);
+            assertArrayEquals(data, result);
 
+            protocol.verifyAll();
+        } finally {
+            socks5Proxy.stop();
+        }
     }
 
     /**
      * Invoking {@link Socks5BytestreamManager#establishSession(org.jxmpp.jid.Jid, String)} the first time
      * should successfully negotiate a SOCKS5 Bytestream via the second SOCKS5 proxy and should
      * prioritize this proxy for a second SOCKS5 Bytestream negotiation.
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     * @throws IOException
      *
-     * @throws Exception should not happen
      */
     @Test
-    public void shouldPrioritizeSecondSocks5ProxyOnSecondAttempt() throws Exception {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldPrioritizeSecondSocks5ProxyOnSecondAttempt() throws SmackException, InterruptedException, IOException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldPrioritizeSecondSocks5ProxyOnSecondAttempt";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
         assertTrue(byteStreamManager.isProxyPrioritizationEnabled());
 
@@ -878,59 +866,58 @@ public class Socks5ByteStreamManagerTest {
             }
 
         };
-        createResponses(streamHostUsedVerification1);
 
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(7778);
-        socks5Proxy.start();
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            createResponses(protocol, sessionID, streamHostUsedVerification1, socks5Proxy);
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // call the method that should be tested
-        OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
+            // call the method that should be tested
+            OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
 
-        // test the established bytestream
-        InputStream inputStream = socks5Proxy.getSocket(digest).getInputStream();
+            // test the established bytestream
+            InputStream inputStream = socks5Proxy.getSocket(digest).getInputStream();
 
-        byte[] data = new byte[] { 1, 2, 3 };
-        outputStream.write(data);
+            byte[] data = new byte[] { 1, 2, 3 };
+            outputStream.write(data);
 
-        byte[] result = new byte[3];
-        inputStream.read(result);
+            byte[] result = new byte[3];
+            inputStream.read(result);
 
-        assertArrayEquals(data, result);
+            assertArrayEquals(data, result);
 
-        protocol.verifyAll();
+            protocol.verifyAll();
 
-        Verification<Bytestream, Bytestream> streamHostUsedVerification2 = new Verification<Bytestream, Bytestream>() {
+            Verification<Bytestream, Bytestream> streamHostUsedVerification2 = new Verification<Bytestream, Bytestream>() {
 
-            @Override
-            public void verify(Bytestream request, Bytestream response) {
-                assertEquals(response.getSessionID(), request.getSessionID());
-                assertEquals(2, request.getStreamHosts().size());
-                // verify that the used stream host is the first in list
-                StreamHost streamHost = (StreamHost) request.getStreamHosts().toArray()[0];
-                assertEquals(response.getUsedHost().getJID(), streamHost.getJID());
-            }
+                @Override
+                public void verify(Bytestream request, Bytestream response) {
+                    assertEquals(response.getSessionID(), request.getSessionID());
+                    assertEquals(2, request.getStreamHosts().size());
+                    // verify that the used stream host is the first in list
+                    StreamHost streamHost = (StreamHost) request.getStreamHosts().toArray()[0];
+                    assertEquals(response.getUsedHost().getJID(), streamHost.getJID());
+                }
 
-        };
-        createResponses(streamHostUsedVerification2);
+            };
+            createResponses(protocol, sessionID, streamHostUsedVerification2, socks5Proxy);
 
-        // call the method that should be tested again
-        outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
+            // call the method that should be tested again
+            outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
 
-        // test the established bytestream
-        inputStream = socks5Proxy.getSocket(digest).getInputStream();
+            // test the established bytestream
+            inputStream = socks5Proxy.getSocket(digest).getInputStream();
 
-        outputStream.write(data);
+            outputStream.write(data);
 
-        inputStream.read(result);
+            inputStream.read(result);
 
-        assertArrayEquals(data, result);
-
-        protocol.verifyAll();
+            assertArrayEquals(data, result);
 
+            protocol.verifyAll();
+        }
     }
 
     /**
@@ -938,18 +925,23 @@ public class Socks5ByteStreamManagerTest {
      * should successfully negotiate a SOCKS5 Bytestream via the second SOCKS5 proxy. The second
      * negotiation should run in the same manner if prioritization is disabled.
      *
-     * @throws Exception should not happen
+     * @throws IOException
+     * @throws InterruptedException
+     * @throws SmackException
+     * @throws XMPPException
+     *
      */
     @Test
-    public void shouldNotPrioritizeSocks5ProxyIfPrioritizationDisabled() throws Exception {
-
-        // disable clients local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
+    public void shouldNotPrioritizeSocks5ProxyIfPrioritizationDisabled() throws IOException, SmackException, InterruptedException, XMPPException {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
+        final String sessionID = "session_id_shouldNotPrioritizeSocks5ProxyIfPrioritizationDisabled";
 
         // get Socks5ByteStreamManager for connection
         Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
-        byteStreamManager.setProxyPrioritizationEnabled(false);
+        byteStreamManager.setAnnounceLocalStreamHost(false);
 
+        byteStreamManager.setProxyPrioritizationEnabled(false);
         assertFalse(byteStreamManager.isProxyPrioritizationEnabled());
 
         Verification<Bytestream, Bytestream> streamHostUsedVerification = new Verification<Bytestream, Bytestream>() {
@@ -964,52 +956,51 @@ public class Socks5ByteStreamManagerTest {
             }
 
         };
-        createResponses(streamHostUsedVerification);
 
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(7778);
-        socks5Proxy.start();
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            createResponses(protocol, sessionID, streamHostUsedVerification, socks5Proxy);
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // call the method that should be tested
-        OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
+            // call the method that should be tested
+            OutputStream outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
 
-        // test the established bytestream
-        InputStream inputStream = socks5Proxy.getSocket(digest).getInputStream();
+            // test the established bytestream
+            InputStream inputStream = socks5Proxy.getSocket(digest).getInputStream();
 
-        byte[] data = new byte[] { 1, 2, 3 };
-        outputStream.write(data);
+            byte[] data = new byte[] { 1, 2, 3 };
+            outputStream.write(data);
 
-        byte[] result = new byte[3];
-        inputStream.read(result);
+            byte[] result = new byte[3];
+            inputStream.read(result);
 
-        assertArrayEquals(data, result);
+            assertArrayEquals(data, result);
+
+            protocol.verifyAll();
+
+            createResponses(protocol, sessionID, streamHostUsedVerification, socks5Proxy);
+
+            // call the method that should be tested again
+            outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
+
+            // test the established bytestream
+            inputStream = socks5Proxy.getSocket(digest).getInputStream();
+
+            outputStream.write(data);
+
+            inputStream.read(result);
+
+            assertArrayEquals(data, result);
+        }
 
         protocol.verifyAll();
-
-        createResponses(streamHostUsedVerification);
-
-        // call the method that should be tested again
-        outputStream = byteStreamManager.establishSession(targetJID, sessionID).getOutputStream();
-
-        // test the established bytestream
-        inputStream = socks5Proxy.getSocket(digest).getInputStream();
-
-        outputStream.write(data);
-
-        inputStream.read(result);
-
-        assertArrayEquals(data, result);
-
-        protocol.verifyAll();
-
-        byteStreamManager.setProxyPrioritizationEnabled(true);
-
     }
 
-    private void createResponses(Verification<Bytestream, Bytestream> streamHostUsedVerification) throws XmppStringprepException {
+    private static void createResponses(Protocol protocol, String sessionID,
+                    Verification<Bytestream, Bytestream> streamHostUsedVerification, Socks5TestProxy socks5TestProxy)
+                    throws XmppStringprepException {
         // build discover info that supports the SOCKS5 feature
         DiscoverInfo discoverInfo = Socks5PacketUtils.createDiscoverInfo(targetJID, initiatorJID);
         discoverInfo.addFeature(Bytestream.NAMESPACE);
@@ -1056,7 +1047,7 @@ public class Socks5ByteStreamManagerTest {
          */
         Bytestream streamHostInfo1 = Socks5PacketUtils.createBytestreamResponse(
                         JidCreate.from("proxy2.xmpp-server"), initiatorJID);
-        streamHostInfo1.addStreamHost(JidCreate.from("proxy2.xmpp-server"), proxyAddress, 7778);
+        streamHostInfo1.addStreamHost(JidCreate.from("proxy2.xmpp-server"), proxyAddress, socks5TestProxy.getPort());
 
         // return stream host info if it is queried
         protocol.addResponse(streamHostInfo1, Verification.correspondingSenderReceiver,
@@ -1065,7 +1056,7 @@ public class Socks5ByteStreamManagerTest {
         // build a SOCKS5 stream host info containing the address and the port of the proxy
         Bytestream streamHostInfo2 = Socks5PacketUtils.createBytestreamResponse(proxyJID,
                         initiatorJID);
-        streamHostInfo2.addStreamHost(proxyJID, proxyAddress, 7778);
+        streamHostInfo2.addStreamHost(proxyJID, proxyAddress, socks5TestProxy.getPort());
 
         // return stream host info if it is queried
         protocol.addResponse(streamHostInfo2, Verification.correspondingSenderReceiver,
@@ -1094,16 +1085,6 @@ public class Socks5ByteStreamManagerTest {
             }
 
         }, Verification.correspondingSenderReceiver, Verification.requestTypeSET);
-
-    }
-
-    /**
-     * Stop eventually started local SOCKS5 test proxy.
-     */
-    @After
-    public void cleanUp() {
-        Socks5TestProxy.stopProxy();
-        Socks5Proxy.setLocalSocks5ProxyEnabled(true);
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
index 37098a646..59d5f99c1 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
@@ -20,27 +20,23 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.util.NetworkUtil;
 
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityFullJid;
@@ -61,27 +57,6 @@ public class Socks5ByteStreamRequestTest {
     private static final String proxyAddress = "127.0.0.1";
     private static final String sessionID = "session_id";
 
-    private Protocol protocol;
-
-    private XMPPConnection connection;
-
-    /**
-     * Initialize fields used in the tests.
-     * @throws XMPPException
-     * @throws SmackException
-     * @throws InterruptedException
-     */
-    @Before
-    public void setup() throws XMPPException, SmackException, InterruptedException {
-
-        // build protocol verifier
-        protocol = new Protocol();
-
-        // create mocked XMPP connection
-        connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
-
-    }
-
     /**
      * Accepting a SOCKS5 Bytestream request should fail if the request doesn't contain any Socks5
      * proxies.
@@ -90,9 +65,10 @@ public class Socks5ByteStreamRequestTest {
      */
     @Test
     public void shouldFailIfRequestHasNoStreamHosts() throws Exception {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
 
-        try {
-
+        assertThrows(Socks5Exception.NoSocks5StreamHostsProvided.class, () -> {
             // build SOCKS5 Bytestream initialization request with no SOCKS5 proxies
             Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
                             initiatorJID, targetJID, sessionID);
@@ -106,12 +82,7 @@ public class Socks5ByteStreamRequestTest {
 
             // accept the stream (this is the call that is tested here)
             byteStreamRequest.accept();
-
-            fail("exception should be thrown");
-        }
-        catch (XMPPErrorException e) {
-            assertTrue(e.getStanzaError().getDescriptiveText("en").contains("Could not establish socket with any provided host"));
-        }
+        });
 
         // verify targets response
         assertEquals(1, protocol.getRequests().size());
@@ -121,7 +92,6 @@ public class Socks5ByteStreamRequestTest {
         assertEquals(IQ.Type.error, ((IQ) targetResponse).getType());
         assertEquals(StanzaError.Condition.item_not_found,
                         targetResponse.getError().getCondition());
-
     }
 
     /**
@@ -132,9 +102,10 @@ public class Socks5ByteStreamRequestTest {
      */
     @Test
     public void shouldFailIfRequestHasInvalidStreamHosts() throws Exception {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
 
-        try {
-
+        assertThrows(Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host.class, () -> {
             // build SOCKS5 Bytestream initialization request
             Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
                             initiatorJID, targetJID, sessionID);
@@ -150,12 +121,7 @@ public class Socks5ByteStreamRequestTest {
 
             // accept the stream (this is the call that is tested here)
             byteStreamRequest.accept();
-
-            fail("exception should be thrown");
-        }
-        catch (XMPPErrorException e) {
-            assertTrue(e.getStanzaError().getDescriptiveText("en").contains("Could not establish socket with any provided host"));
-        }
+        });
 
         // verify targets response
         assertEquals(1, protocol.getRequests().size());
@@ -165,7 +131,6 @@ public class Socks5ByteStreamRequestTest {
         assertEquals(IQ.Type.error, ((IQ) targetResponse).getType());
         assertEquals(StanzaError.Condition.item_not_found,
                         targetResponse.getError().getCondition());
-
     }
 
     /**
@@ -175,10 +140,13 @@ public class Socks5ByteStreamRequestTest {
      */
     @Test
     public void shouldBlacklistInvalidProxyAfter2Failures() throws Exception {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
 
         // build SOCKS5 Bytestream initialization request
         Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
                         initiatorJID, targetJID, sessionID);
+        // Add an unreachable stream host.
         bytestreamInitialization.addStreamHost(JidCreate.from("invalid." + proxyJID), "127.0.0.2", 7778);
 
         // get SOCKS5 Bytestream manager for connection
@@ -186,7 +154,7 @@ public class Socks5ByteStreamRequestTest {
 
         // try to connect several times
         for (int i = 0; i < 2; i++) {
-            try {
+            assertThrows(Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host.class, () -> {
                 // build SOCKS5 Bytestream request with the bytestream initialization
                 Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(
                                 byteStreamManager, bytestreamInitialization);
@@ -197,13 +165,7 @@ public class Socks5ByteStreamRequestTest {
 
                 // accept the stream (this is the call that is tested here)
                 byteStreamRequest.accept();
-
-                fail("exception should be thrown");
-            }
-            catch (XMPPErrorException e) {
-                assertTrue(e.getStanzaError().getDescriptiveText("en").contains(
-                                "Could not establish socket with any provided host"));
-            }
+            });
 
             // verify targets response
             assertEquals(1, protocol.getRequests().size());
@@ -217,44 +179,44 @@ public class Socks5ByteStreamRequestTest {
 
         // create test data for stream
         byte[] data = new byte[] { 1, 2, 3 };
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(7779);
 
-        assertTrue(socks5Proxy.isRunning());
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            assertTrue(socks5Proxy.isRunning());
 
-        // add a valid SOCKS5 proxy
-        bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, 7779);
+            // add a valid SOCKS5 proxy
+            bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, socks5Proxy.getPort());
 
-        // build SOCKS5 Bytestream request with the bytestream initialization
-        Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(byteStreamManager,
-                        bytestreamInitialization);
+            // build SOCKS5 Bytestream request with the bytestream initialization
+            Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(byteStreamManager,
+                            bytestreamInitialization);
 
-        // set timeouts
-        byteStreamRequest.setTotalConnectTimeout(600);
-        byteStreamRequest.setMinimumConnectTimeout(300);
+            // set timeouts
+            byteStreamRequest.setTotalConnectTimeout(600);
+            byteStreamRequest.setMinimumConnectTimeout(300);
 
-        // accept the stream (this is the call that is tested here)
-        InputStream inputStream = byteStreamRequest.accept().getInputStream();
+            // accept the stream (this is the call that is tested here)
+            InputStream inputStream = byteStreamRequest.accept().getInputStream();
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // test stream by sending some data
-        OutputStream outputStream = socks5Proxy.getSocket(digest).getOutputStream();
-        outputStream.write(data);
+            // test stream by sending some data
+            OutputStream outputStream = socks5Proxy.getSocket(digest).getOutputStream();
+            outputStream.write(data);
 
-        // verify that data is transferred correctly
-        byte[] result = new byte[3];
-        inputStream.read(result);
-        assertArrayEquals(data, result);
-
-        // verify targets response
-        assertEquals(1, protocol.getRequests().size());
-        Stanza targetResponse = protocol.getRequests().remove(0);
-        assertEquals(Bytestream.class, targetResponse.getClass());
-        assertEquals(initiatorJID, targetResponse.getTo());
-        assertEquals(IQ.Type.result, ((Bytestream) targetResponse).getType());
-        assertEquals(proxyJID, ((Bytestream) targetResponse).getUsedHost().getJID());
+            // verify that data is transferred correctly
+            byte[] result = new byte[3];
+            inputStream.read(result);
+            assertArrayEquals(data, result);
 
+            // verify targets response
+            assertEquals(1, protocol.getRequests().size());
+            Stanza targetResponse = protocol.getRequests().remove(0);
+            assertEquals(Bytestream.class, targetResponse.getClass());
+            assertEquals(initiatorJID, targetResponse.getTo());
+            assertEquals(IQ.Type.result, ((Bytestream) targetResponse).getType());
+            assertEquals(proxyJID, ((Bytestream) targetResponse).getUsedHost().getJID());
+        }
     }
 
     /**
@@ -264,9 +226,8 @@ public class Socks5ByteStreamRequestTest {
      */
     @Test
     public void shouldNotBlacklistInvalidProxy() throws Exception {
-
-        // disable blacklisting
-        Socks5BytestreamRequest.setConnectFailureThreshold(0);
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
 
         // build SOCKS5 Bytestream initialization request
         Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
@@ -278,7 +239,7 @@ public class Socks5ByteStreamRequestTest {
 
         // try to connect several times
         for (int i = 0; i < 10; i++) {
-            try {
+            assertThrows(Socks5Exception.CouldNotConnectToAnyProvidedSocks5Host.class, () -> {
                 // build SOCKS5 Bytestream request with the bytestream initialization
                 Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(
                                 byteStreamManager, bytestreamInitialization);
@@ -286,16 +247,11 @@ public class Socks5ByteStreamRequestTest {
                 // set timeouts
                 byteStreamRequest.setTotalConnectTimeout(600);
                 byteStreamRequest.setMinimumConnectTimeout(300);
+                byteStreamRequest.setConnectFailureThreshold(0);
 
                 // accept the stream (this is the call that is tested here)
                 byteStreamRequest.accept();
-
-                fail("exception should be thrown");
-            }
-            catch (XMPPErrorException e) {
-                assertTrue(e.getStanzaError().getDescriptiveText("en").contains(
-                                "Could not establish socket with any provided host"));
-            }
+            });
 
             // verify targets response
             assertEquals(1, protocol.getRequests().size());
@@ -306,10 +262,6 @@ public class Socks5ByteStreamRequestTest {
             assertEquals(StanzaError.Condition.item_not_found,
                             targetResponse.getError().getCondition());
         }
-
-        // enable blacklisting
-        Socks5BytestreamRequest.setConnectFailureThreshold(2);
-
     }
 
     /**
@@ -321,62 +273,65 @@ public class Socks5ByteStreamRequestTest {
      */
     @Test
     public void shouldNotTimeoutIfFirstSocks5ProxyDoesNotRespond() throws Exception {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
 
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(7778);
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            // create a fake SOCKS5 proxy that doesn't respond to a request
+            ServerSocket unresponsiveSocks5Socket = NetworkUtil.getSocketOnLoopback();
 
-        // create a fake SOCKS5 proxy that doesn't respond to a request
-        ServerSocket serverSocket = new ServerSocket(7779);
+            try {
+                // build SOCKS5 Bytestream initialization request
+                Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
+                                initiatorJID, targetJID, sessionID);
+                bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, unresponsiveSocks5Socket.getLocalPort());
+                bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, socks5Proxy.getPort());
 
-        // build SOCKS5 Bytestream initialization request
-        Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
-                        initiatorJID, targetJID, sessionID);
-        bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, 7779);
-        bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, 7778);
+                // create test data for stream
+                byte[] data = new byte[] { 1, 2, 3 };
 
-        // create test data for stream
-        byte[] data = new byte[] { 1, 2, 3 };
+                // get SOCKS5 Bytestream manager for connection
+                Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
 
-        // get SOCKS5 Bytestream manager for connection
-        Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+                // build SOCKS5 Bytestream request with the bytestream initialization
+                Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(byteStreamManager,
+                                bytestreamInitialization);
 
-        // build SOCKS5 Bytestream request with the bytestream initialization
-        Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(byteStreamManager,
-                        bytestreamInitialization);
+                // set timeouts
+                byteStreamRequest.setTotalConnectTimeout(2000);
+                byteStreamRequest.setMinimumConnectTimeout(1000);
 
-        // set timeouts
-        byteStreamRequest.setTotalConnectTimeout(2000);
-        byteStreamRequest.setMinimumConnectTimeout(1000);
+                // accept the stream (this is the call that is tested here)
+                InputStream inputStream = byteStreamRequest.accept().getInputStream();
 
-        // accept the stream (this is the call that is tested here)
-        InputStream inputStream = byteStreamRequest.accept().getInputStream();
+                // assert that client tries to connect to dumb SOCKS5 proxy
+                Socket socket = unresponsiveSocks5Socket.accept();
+                assertNotNull(socket);
 
-        // assert that client tries to connect to dumb SOCKS5 proxy
-        Socket socket = serverSocket.accept();
-        assertNotNull(socket);
+                // create digest to get the socket opened by target
+                String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+                // test stream by sending some data
+                OutputStream outputStream = socks5Proxy.getSocket(digest).getOutputStream();
+                outputStream.write(data);
 
-        // test stream by sending some data
-        OutputStream outputStream = socks5Proxy.getSocket(digest).getOutputStream();
-        outputStream.write(data);
-
-        // verify that data is transferred correctly
-        byte[] result = new byte[3];
-        inputStream.read(result);
-        assertArrayEquals(data, result);
-
-        // verify targets response
-        assertEquals(1, protocol.getRequests().size());
-        Stanza targetResponse = protocol.getRequests().remove(0);
-        assertEquals(Bytestream.class, targetResponse.getClass());
-        assertEquals(initiatorJID, targetResponse.getTo());
-        assertEquals(IQ.Type.result, ((Bytestream) targetResponse).getType());
-        assertEquals(proxyJID, ((Bytestream) targetResponse).getUsedHost().getJID());
-
-        serverSocket.close();
+                // verify that data is transferred correctly
+                byte[] result = new byte[3];
+                inputStream.read(result);
+                assertArrayEquals(data, result);
 
+                // verify targets response
+                assertEquals(1, protocol.getRequests().size());
+                Stanza targetResponse = protocol.getRequests().remove(0);
+                assertEquals(Bytestream.class, targetResponse.getClass());
+                assertEquals(initiatorJID, targetResponse.getTo());
+                assertEquals(IQ.Type.result, ((Bytestream) targetResponse).getType());
+                assertEquals(proxyJID, ((Bytestream) targetResponse).getUsedHost().getJID());
+            } finally {
+                unresponsiveSocks5Socket.close();
+            }
+        }
     }
 
     /**
@@ -386,57 +341,48 @@ public class Socks5ByteStreamRequestTest {
      */
     @Test
     public void shouldAcceptSocks5BytestreamRequestAndReceiveData() throws Exception {
+        final Protocol protocol = new Protocol();
+        final XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, targetJID);
 
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(7778);
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            // build SOCKS5 Bytestream initialization request
+            Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
+                            initiatorJID, targetJID, sessionID);
+            bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, socks5Proxy.getPort());
 
-        // build SOCKS5 Bytestream initialization request
-        Bytestream bytestreamInitialization = Socks5PacketUtils.createBytestreamInitiation(
-                        initiatorJID, targetJID, sessionID);
-        bytestreamInitialization.addStreamHost(proxyJID, proxyAddress, 7778);
+            // create test data for stream
+            byte[] data = new byte[] { 1, 2, 3 };
 
-        // create test data for stream
-        byte[] data = new byte[] { 1, 2, 3 };
+            // get SOCKS5 Bytestream manager for connection
+            Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
 
-        // get SOCKS5 Bytestream manager for connection
-        Socks5BytestreamManager byteStreamManager = Socks5BytestreamManager.getBytestreamManager(connection);
+            // build SOCKS5 Bytestream request with the bytestream initialization
+            Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(byteStreamManager,
+                            bytestreamInitialization);
 
-        // build SOCKS5 Bytestream request with the bytestream initialization
-        Socks5BytestreamRequest byteStreamRequest = new Socks5BytestreamRequest(byteStreamManager,
-                        bytestreamInitialization);
+            // accept the stream (this is the call that is tested here)
+            InputStream inputStream = byteStreamRequest.accept().getInputStream();
 
-        // accept the stream (this is the call that is tested here)
-        InputStream inputStream = byteStreamRequest.accept().getInputStream();
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            // test stream by sending some data
+            OutputStream outputStream = socks5Proxy.getSocket(digest).getOutputStream();
+            outputStream.write(data);
 
-        // test stream by sending some data
-        OutputStream outputStream = socks5Proxy.getSocket(digest).getOutputStream();
-        outputStream.write(data);
-
-        // verify that data is transferred correctly
-        byte[] result = new byte[3];
-        inputStream.read(result);
-        assertArrayEquals(data, result);
-
-        // verify targets response
-        assertEquals(1, protocol.getRequests().size());
-        Stanza targetResponse = protocol.getRequests().remove(0);
-        assertEquals(Bytestream.class, targetResponse.getClass());
-        assertEquals(initiatorJID, targetResponse.getTo());
-        assertEquals(IQ.Type.result, ((Bytestream) targetResponse).getType());
-        assertEquals(proxyJID, ((Bytestream) targetResponse).getUsedHost().getJID());
+            // verify that data is transferred correctly
+            byte[] result = new byte[3];
+            inputStream.read(result);
+            assertArrayEquals(data, result);
 
+            // verify targets response
+            assertEquals(1, protocol.getRequests().size());
+            Stanza targetResponse = protocol.getRequests().remove(0);
+            assertEquals(Bytestream.class, targetResponse.getClass());
+            assertEquals(initiatorJID, targetResponse.getTo());
+            assertEquals(IQ.Type.result, ((Bytestream) targetResponse).getType());
+            assertEquals(proxyJID, ((Bytestream) targetResponse).getUsedHost().getJID());
+        }
     }
-
-    /**
-     * Stop eventually started local SOCKS5 test proxy.
-     */
-    @After
-    public void cleanUp() {
-        Socks5TestProxy.stopProxy();
-        Socks5Proxy.setLocalSocks5ProxyEnabled(true);
-    }
-
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
index 3b0a5faf8..fe3807eed 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
@@ -28,12 +28,12 @@ import java.net.Socket;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.EmptyResultIQ;
 import org.jivesoftware.smack.packet.ErrorIQ;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.StanzaError;
+import org.jivesoftware.smack.util.CloseableUtil;
 
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
@@ -41,8 +41,6 @@ import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 import org.jivesoftware.util.ConnectionUtils;
 import org.jivesoftware.util.Protocol;
 import org.jivesoftware.util.Verification;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityFullJid;
@@ -63,31 +61,8 @@ public class Socks5ClientForInitiatorTest {
 
     private static final int GET_SOCKET_TIMEOUT = 90 * 1000;
 
-    private static final int proxyPort = 7890;
     private static final String sessionID = "session_id";
 
-    // protocol verifier
-    private Protocol protocol;
-
-    // mocked XMPP connection
-    private XMPPConnection connection;
-
-    /**
-     * Initialize fields used in the tests.
-     * @throws XMPPException
-     * @throws SmackException
-     * @throws InterruptedException
-     */
-    @Before
-    public void setup() throws XMPPException, SmackException, InterruptedException {
-
-        // build protocol verifier
-        protocol = new Protocol();
-
-        // create mocked XMPP connection
-        connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
-    }
-
     /**
      * If the target is not connected to the local SOCKS5 proxy an exception should be thrown.
      *
@@ -95,35 +70,36 @@ public class Socks5ClientForInitiatorTest {
      */
     @Test
     public void shouldFailIfTargetIsNotConnectedToLocalSocks5Proxy() throws Exception {
+        Protocol protocol = new Protocol();
+        XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
 
         // start a local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyPort(proxyPort);
-        Socks5Proxy socks5Proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy socks5Proxy = new Socks5Proxy();
         socks5Proxy.start();
-
-        // build stream host information for local SOCKS5 proxy
-        StreamHost streamHost = new StreamHost(connection.getUser(),
-                        loopbackAddress,
-                        socks5Proxy.getPort());
-
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
-
-        Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
-                        connection, sessionID, targetJID);
-
         try {
-            socks5Client.getSocket(GET_SOCKET_TIMEOUT);
+            // build stream host information for local SOCKS5 proxy
+            StreamHost streamHost = new StreamHost(connection.getUser(),
+                            loopbackAddress,
+                            socks5Proxy.getPort());
 
-            fail("exception should be thrown");
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+
+            Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
+                            connection, sessionID, targetJID);
+
+            try {
+                socks5Client.getSocket(GET_SOCKET_TIMEOUT);
+
+                fail("exception should be thrown");
+            }
+            catch (SmackException e) {
+                assertTrue(e.getMessage().contains("target is not connected to SOCKS5 proxy"));
+                protocol.verifyAll(); // assert no XMPP messages were sent
+            }
+        } finally {
+            socks5Proxy.stop();
         }
-        catch (SmackException e) {
-            assertTrue(e.getMessage().contains("target is not connected to SOCKS5 proxy"));
-            protocol.verifyAll(); // assert no XMPP messages were sent
-        }
-
-        socks5Proxy.stop();
-
     }
 
     /**
@@ -133,65 +109,67 @@ public class Socks5ClientForInitiatorTest {
      */
     @Test
     public void shouldSuccessfullyConnectThroughLocalSocks5Proxy() throws Exception {
+        Protocol protocol = new Protocol();
+        XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
 
         // start a local SOCKS5 proxy
-        Socks5Proxy.setLocalSocks5ProxyPort(proxyPort);
-        Socks5Proxy socks5Proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy socks5Proxy = new Socks5Proxy();
         socks5Proxy.start();
+        try {
+            // test data
+            final byte[] data = new byte[] { 1, 2, 3 };
 
-        // test data
-        final byte[] data = new byte[] { 1, 2, 3 };
+            // create digest
+            final String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // create digest
-        final String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            // allow connection of target with this digest
+            socks5Proxy.addTransfer(digest);
 
-        // allow connection of target with this digest
-        socks5Proxy.addTransfer(digest);
+            // build stream host information
+            final StreamHost streamHost = new StreamHost(connection.getUser(),
+                            loopbackAddress,
+                            socks5Proxy.getPort());
 
-        // build stream host information
-        final StreamHost streamHost = new StreamHost(connection.getUser(),
-                        loopbackAddress,
-                        socks5Proxy.getPort());
-
-        // target connects to local SOCKS5 proxy
-        Thread targetThread = new Thread() {
-
-            @Override
-            public void run() {
-                try {
-                    Socks5Client targetClient = new Socks5Client(streamHost, digest);
-                    Socket socket = targetClient.getSocket(10000);
-                    socket.getOutputStream().write(data);
-                }
-                catch (Exception e) {
-                    fail(e.getMessage());
+            // target connects to local SOCKS5 proxy
+            Thread targetThread = new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        Socks5Client targetClient = new Socks5Client(streamHost, digest);
+                        Socket socket = targetClient.getSocket(10000);
+                        socket.getOutputStream().write(data);
+                    }
+                    catch (Exception e) {
+                        // TODO: This does not work.
+                        fail(e.getMessage());
+                    }
                 }
+            };
+            targetThread.start();
+
+            // TODO: Replace this Thread.sleep().
+            Thread.sleep(200);
+
+            // initiator connects
+            Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
+                            connection, sessionID, targetJID);
+
+            Socket socket = socks5Client.getSocket(GET_SOCKET_TIMEOUT);
+
+            // verify test data
+            InputStream in = socket.getInputStream();
+            for (int i = 0; i < data.length; i++) {
+                assertEquals(data[i], in.read());
             }
 
-        };
-        targetThread.start();
+            targetThread.join();
 
-        Thread.sleep(200);
+            protocol.verifyAll(); // assert no XMPP messages were sent
 
-        // initiator connects
-        Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
-                        connection, sessionID, targetJID);
-
-        Socket socket = socks5Client.getSocket(GET_SOCKET_TIMEOUT);
-
-        // verify test data
-        InputStream in = socket.getInputStream();
-        for (int i = 0; i < data.length; i++) {
-            assertEquals(data[i], in.read());
+            socks5Proxy.removeTransfer(digest);
+        } finally {
+            socks5Proxy.stop();
         }
-
-        targetThread.join();
-
-        protocol.verifyAll(); // assert no XMPP messages were sent
-
-        socks5Proxy.removeTransfer(digest);
-        socks5Proxy.stop();
-
     }
 
     /**
@@ -202,6 +180,8 @@ public class Socks5ClientForInitiatorTest {
      */
     @Test
     public void shouldFailIfActivateSocks5ProxyFails() throws Exception {
+        Protocol protocol = new Protocol();
+        XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
 
         // build error response as reply to the stream activation
         IQ error = new ErrorIQ(StanzaError.getBuilder(StanzaError.Condition.internal_server_error));
@@ -212,30 +192,25 @@ public class Socks5ClientForInitiatorTest {
                         Verification.requestTypeSET);
 
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(proxyPort);
-        socks5Proxy.start();
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            StreamHost streamHost = new StreamHost(proxyJID, loopbackAddress, socks5Proxy.getPort());
 
-        StreamHost streamHost = new StreamHost(proxyJID,
-                        loopbackAddress, socks5Proxy.getPort());
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest, connection,
+                            sessionID, targetJID);
 
-        Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
-                        connection, sessionID, targetJID);
+            try {
 
-        try {
+                socks5Client.getSocket(GET_SOCKET_TIMEOUT);
 
-            socks5Client.getSocket(GET_SOCKET_TIMEOUT);
-
-            fail("exception should be thrown");
+                fail("exception should be thrown");
+            } catch (XMPPErrorException e) {
+                assertTrue(StanzaError.Condition.internal_server_error.equals(e.getStanzaError().getCondition()));
+                protocol.verifyAll();
+            }
         }
-        catch (XMPPErrorException e) {
-            assertTrue(StanzaError.Condition.internal_server_error.equals(e.getStanzaError().getCondition()));
-            protocol.verifyAll();
-        }
-
-        socks5Proxy.stop();
     }
 
     /**
@@ -246,6 +221,8 @@ public class Socks5ClientForInitiatorTest {
      */
     @Test
     public void shouldSuccessfullyEstablishConnectionAndActivateSocks5Proxy() throws Exception {
+        Protocol protocol = new Protocol();
+        XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, initiatorJID);
 
         // build activation confirmation response
         IQ activationResponse = new EmptyResultIQ();
@@ -265,45 +242,34 @@ public class Socks5ClientForInitiatorTest {
 
                         });
 
+        Socket initiatorSocket = null, targetSocket = null;
         // start a local SOCKS5 proxy
-        Socks5TestProxy socks5Proxy = Socks5TestProxy.getProxy(proxyPort);
-        socks5Proxy.start();
+        try (Socks5TestProxy socks5Proxy = new Socks5TestProxy()) {
+            StreamHost streamHost = new StreamHost(proxyJID, loopbackAddress, socks5Proxy.getPort());
 
-        StreamHost streamHost = new StreamHost(proxyJID,
-                        loopbackAddress, socks5Proxy.getPort());
+            // create digest to get the socket opened by target
+            String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
 
-        // create digest to get the socket opened by target
-        String digest = Socks5Utils.createDigest(sessionID, initiatorJID, targetJID);
+            Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest, connection,
+                            sessionID, targetJID);
 
-        Socks5ClientForInitiator socks5Client = new Socks5ClientForInitiator(streamHost, digest,
-                        connection, sessionID, targetJID);
+            initiatorSocket = socks5Client.getSocket(10000);
+            InputStream in = initiatorSocket.getInputStream();
 
-        Socket initiatorSocket = socks5Client.getSocket(10000);
-        InputStream in = initiatorSocket.getInputStream();
+            targetSocket = socks5Proxy.getSocket(digest);
+            OutputStream out = targetSocket.getOutputStream();
 
-        Socket targetSocket = socks5Proxy.getSocket(digest);
-        OutputStream out = targetSocket.getOutputStream();
+            // verify test data
+            for (int i = 0; i < 10; i++) {
+                out.write(i);
+                assertEquals(i, in.read());
+            }
 
-        // verify test data
-        for (int i = 0; i < 10; i++) {
-            out.write(i);
-            assertEquals(i, in.read());
+            protocol.verifyAll();
+        } finally {
+            CloseableUtil.maybeClose(initiatorSocket);
+            CloseableUtil.maybeClose(targetSocket);
         }
-
-        protocol.verifyAll();
-
-        initiatorSocket.close();
-        targetSocket.close();
-        socks5Proxy.stop();
-
-    }
-
-    /**
-     * Reset default port for local SOCKS5 proxy.
-     */
-    @After
-    public void cleanup() {
-        Socks5Proxy.setLocalSocks5ProxyPort(7777);
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
index 430b83f5b..82f4c2d2b 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
@@ -25,10 +25,10 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.util.NetworkUtil;
-import org.jivesoftware.smack.util.StringUtils;
 
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
 
@@ -238,7 +238,7 @@ public class Socks5ClientTest {
         // reply with full SOCKS5 message with an error code (01 = general SOCKS server
         // failure)
         out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x00, (byte) 0x03 });
-        byte[] address = digest.getBytes(StringUtils.UTF8);
+        byte[] address = digest.getBytes(StandardCharsets.UTF_8);
         out.write(address.length);
         out.write(address);
         out.write(new byte[] { (byte) 0x00, (byte) 0x00 });
@@ -297,7 +297,7 @@ public class Socks5ClientTest {
         out.write(new byte[] { (byte) 0x05, (byte) 0x00 });
         out.flush();
 
-        byte[] address = digest.getBytes(StringUtils.UTF8);
+        byte[] address = digest.getBytes(StandardCharsets.UTF_8);
 
         assertEquals((byte) 0x05, (byte) in.read()); // version
         assertEquals((byte) 0x01, (byte) in.read()); // connect request
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
index 5380b5591..54ead2f51 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
@@ -29,14 +29,12 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 
-import org.jivesoftware.smack.util.StringUtils;
-
-import org.junit.After;
 import org.junit.Test;
 
 /**
@@ -49,12 +47,10 @@ public class Socks5ProxyTest {
     private static final String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress();
 
     /**
-     * The SOCKS5 proxy should be a singleton used by all XMPP connections.
+     * The SOCKS5 proxy should be a quasi singleton used by all XMPP connections.
      */
     @Test
-    public void shouldBeASingleton() {
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
-
+    public void shouldBeAQuasiSingleton() {
         Socks5Proxy proxy1 = Socks5Proxy.getSocks5Proxy();
         Socks5Proxy proxy2 = Socks5Proxy.getSocks5Proxy();
 
@@ -63,16 +59,6 @@ public class Socks5ProxyTest {
         assertSame(proxy1, proxy2);
     }
 
-    /**
-     * The SOCKS5 proxy should not be started if disabled by configuration.
-     */
-    @Test
-    public void shouldNotBeRunningIfDisabled() {
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
-        assertFalse(proxy.isRunning());
-    }
-
     /**
      * The SOCKS5 proxy should use a free port above the one configured.
      *
@@ -80,44 +66,45 @@ public class Socks5ProxyTest {
      */
     @Test
     public void shouldUseFreePortOnNegativeValues() throws Exception {
-        Socks5Proxy.setLocalSocks5ProxyEnabled(false);
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy proxy = new Socks5Proxy();
         assertFalse(proxy.isRunning());
 
-        ServerSocket serverSocket = new ServerSocket(0);
-        Socks5Proxy.setLocalSocks5ProxyPort(-serverSocket.getLocalPort());
+        try (ServerSocket serverSocket = new ServerSocket(0)) {
+            proxy.setLocalSocks5ProxyPort(-serverSocket.getLocalPort());
 
-        proxy.start();
+            proxy.start();
 
-        assertTrue(proxy.isRunning());
-
-        serverSocket.close();
-
-        assertTrue(proxy.getPort() > serverSocket.getLocalPort());
+            assertTrue(proxy.isRunning());
 
+            assertTrue(proxy.getPort() > serverSocket.getLocalPort());
+        } finally {
+            proxy.stop();
+        }
     }
 
     /**
      * When inserting new network addresses to the proxy the order should remain in the order they
      * were inserted.
+     *
+     * @throws UnknownHostException
      */
     @Test
-    public void shouldPreserveAddressOrderOnInsertions() {
+    public void shouldPreserveAddressOrderOnInsertions() throws UnknownHostException {
         Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
 
-        LinkedHashSet<String> addresses = new LinkedHashSet<>(proxy.getLocalAddresses());
+        LinkedHashSet<InetAddress> addresses = new LinkedHashSet<>(proxy.getLocalAddresses());
 
         for (int i = 1 ; i <= 3; i++) {
-            addresses.add(Integer.toString(i));
+            addresses.add(InetAddress.getByName(Integer.toString(i)));
         }
 
-        for (String address : addresses) {
+        for (InetAddress address : addresses) {
             proxy.addLocalAddress(address);
         }
 
-        List<String> localAddresses = proxy.getLocalAddresses();
+        List<InetAddress> localAddresses = proxy.getLocalAddresses();
 
-        Iterator<String> iterator = addresses.iterator();
+        Iterator<InetAddress> iterator = addresses.iterator();
         for (int i = 0; i < addresses.size(); i++) {
             assertEquals(iterator.next(), localAddresses.get(i));
         }
@@ -126,44 +113,25 @@ public class Socks5ProxyTest {
     /**
      * When replacing network addresses of the proxy the order should remain in the order if the
      * given list.
+     *
+     * @throws UnknownHostException
      */
     @Test
-    public void shouldPreserveAddressOrderOnReplace() {
+    public void shouldPreserveAddressOrderOnReplace() throws UnknownHostException {
         Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
-        List<String> addresses = new ArrayList<>(proxy.getLocalAddresses());
-        addresses.add("1");
-        addresses.add("2");
-        addresses.add("3");
+        List<InetAddress> addresses = new ArrayList<>(proxy.getLocalAddresses());
+        addresses.add(InetAddress.getByName("1"));
+        addresses.add(InetAddress.getByName("2"));
+        addresses.add(InetAddress.getByName("3"));
 
         proxy.replaceLocalAddresses(addresses);
 
-        List<String> localAddresses = proxy.getLocalAddresses();
+        List<InetAddress> localAddresses = proxy.getLocalAddresses();
         for (int i = 0; i < addresses.size(); i++) {
             assertEquals(addresses.get(i), localAddresses.get(i));
         }
     }
 
-    /**
-     * Inserting the same address multiple times should not cause the proxy to return this address
-     * multiple times.
-     */
-    @Test
-    public void shouldNotReturnMultipleSameAddress() {
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
-
-        proxy.addLocalAddress("same");
-        proxy.addLocalAddress("same");
-        proxy.addLocalAddress("same");
-
-        int sameCount = 0;
-        for (String localAddress : proxy.getLocalAddresses()) {
-            if ("same".equals(localAddress)) {
-                sameCount++;
-            }
-        }
-        assertEquals(1, sameCount);
-    }
-
     /**
      * If the SOCKS5 proxy accepts a connection that is not a SOCKS5 connection it should close the
      * corresponding socket.
@@ -172,27 +140,24 @@ public class Socks5ProxyTest {
      */
     @Test
     public void shouldCloseSocketIfNoSocks5Request() throws Exception {
-        Socks5Proxy.setLocalSocks5ProxyPort(7890);
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy proxy = new Socks5Proxy();
         proxy.start();
 
-        @SuppressWarnings("resource")
-        Socket socket = new Socket(loopbackAddress, proxy.getPort());
+        try (Socket socket = new Socket(loopbackAddress, proxy.getPort())) {
+            OutputStream out = socket.getOutputStream();
+            out.write(new byte[] { 1, 2, 3 });
 
-        OutputStream out = socket.getOutputStream();
-        out.write(new byte[] { 1, 2, 3 });
+            int res;
+            try {
+                res = socket.getInputStream().read();
+            } catch (SocketException e) {
+                res = -1;
+            }
 
-        int res;
-        try {
-            res = socket.getInputStream().read();
-        } catch (SocketException e) {
-            res = -1;
+            assertEquals(-1, res);
+        } finally {
+            proxy.stop();
         }
-
-        assertEquals(-1, res);
-
-        proxy.stop();
-
     }
 
     /**
@@ -203,27 +168,24 @@ public class Socks5ProxyTest {
      */
     @Test
     public void shouldRespondWithErrorIfNoSupportedAuthenticationMethod() throws Exception {
-        Socks5Proxy.setLocalSocks5ProxyPort(7890);
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy proxy = new Socks5Proxy();
         proxy.start();
 
-        @SuppressWarnings("resource")
-        Socket socket = new Socket(loopbackAddress, proxy.getPort());
+        try (Socket socket = new Socket(loopbackAddress, proxy.getPort())) {
+            OutputStream out = socket.getOutputStream();
 
-        OutputStream out = socket.getOutputStream();
+            // request username/password-authentication
+            out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x02 });
 
-        // request username/password-authentication
-        out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x02 });
+            InputStream in = socket.getInputStream();
 
-        InputStream in = socket.getInputStream();
-
-        assertEquals((byte) 0x05, (byte) in.read());
-        assertEquals((byte) 0xFF, (byte) in.read());
-
-        assertEquals(-1, in.read());
-
-        proxy.stop();
+            assertEquals((byte) 0x05, (byte) in.read());
+            assertEquals((byte) 0xFF, (byte) in.read());
 
+            assertEquals(-1, in.read());
+        } finally {
+            proxy.stop();
+        }
     }
 
     /**
@@ -234,39 +196,36 @@ public class Socks5ProxyTest {
      */
     @Test
     public void shouldRespondWithErrorIfConnectionIsNotAllowed() throws Exception {
-        Socks5Proxy.setLocalSocks5ProxyPort(7890);
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy proxy = new Socks5Proxy();
         proxy.start();
 
-        @SuppressWarnings("resource")
-        Socket socket = new Socket(loopbackAddress, proxy.getPort());
+        try (Socket socket = new Socket(loopbackAddress, proxy.getPort())) {
+            OutputStream out = socket.getOutputStream();
+            out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x00 });
 
-        OutputStream out = socket.getOutputStream();
-        out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x00 });
+            InputStream in = socket.getInputStream();
 
-        InputStream in = socket.getInputStream();
+            assertEquals((byte) 0x05, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read());
 
-        assertEquals((byte) 0x05, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read());
+            // send valid SOCKS5 message
+            out.write(new byte[] { (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x01, (byte) 0xAA,
+                            (byte) 0x00, (byte) 0x00 });
 
-        // send valid SOCKS5 message
-        out.write(new byte[] { (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x01,
-                (byte) 0xAA, (byte) 0x00, (byte) 0x00 });
-
-        // verify error message
-        assertEquals((byte) 0x05, (byte) in.read());
-        assertFalse((byte) 0x00 == (byte) in.read()); // something other than 0 == success
-        assertEquals((byte) 0x00, (byte) in.read());
-        assertEquals((byte) 0x03, (byte) in.read());
-        assertEquals((byte) 0x01, (byte) in.read());
-        assertEquals((byte) 0xAA, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read());
-
-        assertEquals(-1, in.read());
-
-        proxy.stop();
+            // verify error message
+            assertEquals((byte) 0x05, (byte) in.read());
+            assertFalse((byte) 0x00 == (byte) in.read()); // something other than 0 == success
+            assertEquals((byte) 0x00, (byte) in.read());
+            assertEquals((byte) 0x03, (byte) in.read());
+            assertEquals((byte) 0x01, (byte) in.read());
+            assertEquals((byte) 0xAA, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read());
 
+            assertEquals(-1, in.read());
+        } finally {
+            proxy.stop();
+        }
     }
 
     /**
@@ -276,85 +235,63 @@ public class Socks5ProxyTest {
      */
     @Test
     public void shouldSuccessfullyEstablishConnection() throws Exception {
-        Socks5Proxy.setLocalSocks5ProxyPort(7890);
-        Socks5Proxy proxy = Socks5Proxy.getSocks5Proxy();
+        Socks5Proxy proxy = new Socks5Proxy();
         proxy.start();
 
-        assertTrue(proxy.isRunning());
-        String digest = new String(new byte[] { (byte) 0xAA }, StringUtils.UTF8);
-
-        // add digest to allow connection
-        proxy.addTransfer(digest);
-
-        @SuppressWarnings("resource")
-        Socket socket = new Socket(loopbackAddress, proxy.getPort());
-
-        OutputStream out = socket.getOutputStream();
-        out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x00 });
-
-        InputStream in = socket.getInputStream();
-
-        assertEquals((byte) 0x05, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read());
-
-        // send valid SOCKS5 message
-        out.write(new byte[] { (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x01,
-                (byte) 0xAA, (byte) 0x00, (byte) 0x00 });
-
-        // verify response
-        assertEquals((byte) 0x05, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read()); // success
-        assertEquals((byte) 0x00, (byte) in.read());
-        assertEquals((byte) 0x03, (byte) in.read());
-        assertEquals((byte) 0x01, (byte) in.read());
-        assertEquals((byte) 0xAA, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read());
-        assertEquals((byte) 0x00, (byte) in.read());
-
-        Thread.sleep(200);
-
-        Socket remoteSocket = proxy.getSocket(digest);
-
-        // remove digest
-        proxy.removeTransfer(digest);
-
-        // test stream
-        OutputStream remoteOut = remoteSocket.getOutputStream();
-        byte[] data = new byte[] { 1, 2, 3, 4, 5 };
-        remoteOut.write(data);
-        remoteOut.flush();
-
-        for (int i = 0; i < data.length; i++) {
-            assertEquals(data[i], in.read());
-        }
-
-        remoteSocket.close();
-
-        assertEquals(-1, in.read());
-
-        proxy.stop();
-
-    }
-
-    /**
-     * Reset SOCKS5 proxy settings.
-     */
-    @After
-    public void cleanup() {
-        Socks5Proxy.setLocalSocks5ProxyEnabled(true);
-        Socks5Proxy.setLocalSocks5ProxyPort(7777);
-        Socks5Proxy socks5Proxy = Socks5Proxy.getSocks5Proxy();
         try {
-            String address = InetAddress.getLocalHost().getHostAddress();
-            List<String> addresses = new ArrayList<>();
-            addresses.add(address);
-            socks5Proxy.replaceLocalAddresses(addresses);
-        }
-        catch (UnknownHostException e) {
-            // ignore
-        }
+            assertTrue(proxy.isRunning());
+            String digest = new String(new byte[] { (byte) 0xAA }, StandardCharsets.UTF_8);
 
-        socks5Proxy.stop();
+            // add digest to allow connection
+            proxy.addTransfer(digest);
+
+            @SuppressWarnings("resource")
+            Socket socket = new Socket(loopbackAddress, proxy.getPort());
+
+            OutputStream out = socket.getOutputStream();
+            out.write(new byte[] { (byte) 0x05, (byte) 0x01, (byte) 0x00 });
+
+            InputStream in = socket.getInputStream();
+
+            assertEquals((byte) 0x05, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read());
+
+            // send valid SOCKS5 message
+            out.write(new byte[] { (byte) 0x05, (byte) 0x00, (byte) 0x00, (byte) 0x03, (byte) 0x01, (byte) 0xAA,
+                            (byte) 0x00, (byte) 0x00 });
+
+            // verify response
+            assertEquals((byte) 0x05, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read()); // success
+            assertEquals((byte) 0x00, (byte) in.read());
+            assertEquals((byte) 0x03, (byte) in.read());
+            assertEquals((byte) 0x01, (byte) in.read());
+            assertEquals((byte) 0xAA, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read());
+            assertEquals((byte) 0x00, (byte) in.read());
+
+            Socket remoteSocket = proxy.getSocket(digest);
+
+            try {
+                // remove digest
+                proxy.removeTransfer(digest);
+
+                // test stream
+                OutputStream remoteOut = remoteSocket.getOutputStream();
+                byte[] data = new byte[] { 1, 2, 3, 4, 5 };
+                remoteOut.write(data);
+                remoteOut.flush();
+
+                for (int i = 0; i < data.length; i++) {
+                    assertEquals(data[i], in.read());
+                }
+            } finally {
+                remoteSocket.close();
+            }
+
+            assertEquals(-1, in.read());
+        } finally {
+            proxy.stop();
+        }
     }
-
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
index 6684c6f89..3d32ebd40 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
@@ -16,21 +16,10 @@
  */
 package org.jivesoftware.smackx.bytestreams.socks5;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
-import org.jivesoftware.smack.SmackException;
-import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.util.NetworkUtil;
 
 /**
  * Simple SOCKS5 proxy for testing purposes. It is almost the same as the Socks5Proxy class but the
@@ -38,275 +27,19 @@ import org.jivesoftware.smack.util.StringUtils;
  *
  * @author Henning Staib
  */
-public final class Socks5TestProxy {
-    private static final Logger LOGGER = Logger.getLogger(Socks5TestProxy.class.getName());
+public final class Socks5TestProxy extends Socks5Proxy implements AutoCloseable {
 
-    /* SOCKS5 proxy singleton */
-    private static Socks5TestProxy socks5Server;
-
-    /* reusable implementation of a SOCKS5 proxy server process */
-    private Socks5ServerProcess serverProcess;
-
-    /* thread running the SOCKS5 server process */
-    private Thread serverThread;
-
-    /* server socket to accept SOCKS5 connections */
-    private ServerSocket serverSocket;
-
-    /* assigns a connection to a digest */
-    private final Map<String, Socket> connectionMap = new ConcurrentHashMap<String, Socket>();
-
-    /* port of the test proxy */
-    private int port = 7777;
-
-    private boolean startupComplete;
-
-    /**
-     * Private constructor.
-     */
-    private Socks5TestProxy(int port) {
-        this.serverProcess = new Socks5ServerProcess();
-        this.port = port;
+    public Socks5TestProxy(ServerSocket serverSocket) {
+        super(serverSocket);
     }
 
-    /**
-     * Returns the local SOCKS5 proxy server.
-     *
-     * @param port of the test proxy
-     * @return the local SOCKS5 proxy server
-     */
-    public static synchronized Socks5TestProxy getProxy(int port) {
-        if (socks5Server == null) {
-            socks5Server = new Socks5TestProxy(port);
-            socks5Server.start();
-        }
-        return socks5Server;
+    public Socks5TestProxy() throws IOException {
+        this(NetworkUtil.getSocketOnLoopback());
     }
 
-    /**
-     * Stops the test proxy.
-     */
-    public static synchronized void stopProxy() {
-        if (socks5Server != null) {
-            socks5Server.stop();
-            socks5Server = null;
-        }
-    }
-
-    /**
-     * Starts the local SOCKS5 proxy server. If it is already running, this method does nothing.
-     */
-    public synchronized void start() {
-        if (isRunning()) {
-            return;
-        }
-        try {
-            this.serverSocket = new ServerSocket(this.port);
-            this.serverThread = new Thread(this.serverProcess);
-            this.serverThread.start();
-        }
-        catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "exception", e);
-            // do nothing
-        }
-    }
-
-    /**
-     * Stops the local SOCKS5 proxy server. If it is not running this method does nothing.
-     */
-    public synchronized void stop() {
-        if (!isRunning()) {
-            return;
-        }
-
-        try {
-            this.serverSocket.close();
-        }
-        catch (IOException e) {
-            // do nothing
-            LOGGER.log(Level.SEVERE, "exception", e);
-        }
-
-        if (this.serverThread != null && this.serverThread.isAlive()) {
-            try {
-                this.serverThread.interrupt();
-                this.serverThread.join();
-            }
-            catch (InterruptedException e) {
-                // do nothing
-                LOGGER.log(Level.SEVERE, "exception", e);
-            }
-        }
-        this.serverThread = null;
-        this.serverSocket = null;
-
-    }
-
-    /**
-     * Returns the host address of the local SOCKS5 proxy server.
-     *
-     * @return the host address of the local SOCKS5 proxy server
-     */
-    public static String getAddress() {
-        try {
-            return InetAddress.getLocalHost().getHostAddress();
-        }
-        catch (UnknownHostException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the port of the local SOCKS5 proxy server. If it is not running -1 will be returned.
-     *
-     * @return the port of the local SOCKS5 proxy server or -1 if proxy is not running
-     */
-    public int getPort() {
-        if (!isRunning()) {
-            return -1;
-        }
-        return this.serverSocket.getLocalPort();
-    }
-
-    /**
-     * Returns the socket for the given digest.
-     *
-     * @param digest identifying the connection
-     * @return socket or null if there is no socket for the given digest
-     */
-    @SuppressWarnings("WaitNotInLoop")
-    public Socket getSocket(String digest) {
-        synchronized (this) {
-            if (!startupComplete) {
-                try {
-                    wait(5000);
-                } catch (InterruptedException e) {
-                    LOGGER.log(Level.SEVERE, "exception", e);
-                }
-            }
-        }
-        if (!startupComplete) {
-            throw new IllegalStateException("Startup of Socks5TestProxy failed within 5 seconds");
-        }
-        return this.connectionMap.get(digest);
-    }
-
-    /**
-     * Returns true if the local SOCKS5 proxy server is running, otherwise false.
-     *
-     * @return true if the local SOCKS5 proxy server is running, otherwise false
-     */
-    public boolean isRunning() {
-        return this.serverSocket != null;
-    }
-
-    /**
-     * Implementation of a simplified SOCKS5 proxy server.
-     *
-     * @author Henning Staib
-     */
-    class Socks5ServerProcess implements Runnable {
-
-        @Override
-        public void run() {
-            while (true) {
-                Socket socket = null;
-
-                try {
-
-                    if (Socks5TestProxy.this.serverSocket.isClosed()
-                                    || Thread.currentThread().isInterrupted()) {
-                        return;
-                    }
-
-                    // accept connection
-                    socket = Socks5TestProxy.this.serverSocket.accept();
-
-                    // initialize connection
-                    establishConnection(socket);
-
-                    synchronized (this) {
-                        startupComplete = true;
-                        notify();
-                    }
-                }
-                catch (SocketException e) {
-                    /* do nothing */
-                }
-                catch (Exception e) {
-                    try {
-                        LOGGER.log(Level.SEVERE, "exception", e);
-                        socket.close();
-                    }
-                    catch (IOException e1) {
-                        /* Do Nothing */
-                    }
-                }
-            }
-
-        }
-
-        /**
-         * Negotiates a SOCKS5 connection and stores it on success.
-         *
-         * @param socket connection to the client
-         * @throws SmackException if client requests a connection in an unsupported way
-         * @throws IOException if a network error occurred
-         */
-        private void establishConnection(Socket socket) throws IOException, SmackException {
-            DataOutputStream out = new DataOutputStream(socket.getOutputStream());
-            DataInputStream in = new DataInputStream(socket.getInputStream());
-
-            // first byte is version should be 5
-            int b = in.read();
-            if (b != 5) {
-                throw new SmackException.SmackMessageException("Only SOCKS5 supported");
-            }
-
-            // second byte number of authentication methods supported
-            b = in.read();
-
-            // read list of supported authentication methods
-            byte[] auth = new byte[b];
-            in.readFully(auth);
-
-            byte[] authMethodSelectionResponse = new byte[2];
-            authMethodSelectionResponse[0] = (byte) 0x05; // protocol version
-
-            // only authentication method 0, no authentication, supported
-            boolean noAuthMethodFound = false;
-            for (int i = 0; i < auth.length; i++) {
-                if (auth[i] == (byte) 0x00) {
-                    noAuthMethodFound = true;
-                    break;
-                }
-            }
-
-            if (!noAuthMethodFound) {
-                authMethodSelectionResponse[1] = (byte) 0xFF; // no acceptable methods
-                out.write(authMethodSelectionResponse);
-                out.flush();
-                throw new SmackException.SmackMessageException("Authentication method not supported");
-            }
-
-            authMethodSelectionResponse[1] = (byte) 0x00; // no-authentication method
-            out.write(authMethodSelectionResponse);
-            out.flush();
-
-            // receive connection request
-            byte[] connectionRequest = Socks5Utils.receiveSocks5Message(in);
-
-            // extract digest
-            String responseDigest = new String(connectionRequest, 5, connectionRequest[4], StringUtils.UTF8);
-
-            connectionRequest[1] = (byte) 0x00; // set return status to 0 (success)
-            out.write(connectionRequest);
-            out.flush();
-
-            // store connection
-            Socks5TestProxy.this.connectionMap.put(responseDigest, socket);
-        }
-
+    @Override
+    public void close() {
+        stop();
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
index 54d9e04dc..bd6908d4b 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
@@ -75,6 +75,7 @@ public class EntityCapsManagerTest extends InitExtensions {
         assertTrue(di.containsDuplicateIdentities());
     }
 
+    @SuppressWarnings("UnusedVariable")
     private static void testSimpleDirectoryCache(StringEncoder<String> stringEncoder) throws IOException {
 
         EntityCapsPersistentCache cache = new SimpleDirectoryPersistentCache(createTempDirectory());
@@ -116,31 +117,31 @@ public class EntityCapsManagerTest extends InitExtensions {
 
         DataForm df = new DataForm(DataForm.Type.result);
 
-        FormField ff = new FormField("os");
+        FormField.Builder ff = FormField.builder("os");
         ff.addValue("Mac");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("FORM_TYPE");
+        ff = FormField.builder("FORM_TYPE");
         ff.setType(FormField.Type.hidden);
         ff.addValue("urn:xmpp:dataforms:softwareinfo");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("ip_version");
+        ff = FormField.builder("ip_version");
         ff.addValue("ipv4");
         ff.addValue("ipv6");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("os_version");
+        ff = FormField.builder("os_version");
         ff.addValue("10.5.1");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("software");
+        ff = FormField.builder("software");
         ff.addValue("Psi");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("software_version");
+        ff = FormField.builder("software_version");
         ff.addValue("0.11");
-        df.addField(ff);
+        df.addField(ff.build());
 
         di.addExtension(df);
         return di;
@@ -173,31 +174,31 @@ public class EntityCapsManagerTest extends InitExtensions {
 
         DataForm df = new DataForm(DataForm.Type.result);
 
-        FormField ff = new FormField("os");
+        FormField.Builder ff = FormField.builder("os");
         ff.addValue("Mac");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("FORM_TYPE");
+        ff = FormField.builder("FORM_TYPE");
         ff.setType(FormField.Type.hidden);
         ff.addValue("urn:xmpp:dataforms:softwareinfo");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("ip_version");
+        ff = FormField.builder("ip_version");
         ff.addValue("ipv4");
         ff.addValue("ipv6");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("os_version");
+        ff = FormField.builder("os_version");
         ff.addValue("10.5.1");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("software");
+        ff = FormField.builder("software");
         ff.addValue("Psi");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("software_version");
+        ff = FormField.builder("software_version");
         ff.addValue("0.11");
-        df.addField(ff);
+        df.addField(ff.build());
 
         di.addExtension(df);
 
@@ -205,14 +206,14 @@ public class EntityCapsManagerTest extends InitExtensions {
         // FORM_TYPE
         df = new DataForm(DataForm.Type.result);
 
-        ff = new FormField("FORM_TYPE");
+        ff = FormField.builder("FORM_TYPE");
         ff.setType(FormField.Type.hidden);
         ff.addValue("urn:xmpp:dataforms:softwareinfo");
-        df.addField(ff);
+        df.addField(ff.build());
 
-        ff = new FormField("software");
+        ff = FormField.builder("software");
         ff.addValue("smack");
-        df.addField(ff);
+        df.addField(ff.build());
 
         di.addExtension(df);
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProviderTest.java
index 010aae139..efc071aca 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProviderTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015 Florian Schmaus
+ * Copyright 2015-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,19 @@ package org.jivesoftware.smackx.caps.provider;
 
 import static org.junit.Assert.assertNotNull;
 
-import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
 
 import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.caps.packet.CapsExtension;
 
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 public class CapsExtensionProviderTest extends InitExtensions {
 
-    @Test
-    public void parseTest() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void parseTest(SmackTestUtil.XmlPullParserKind parserKind) throws Exception {
         // @formatter:off
         final String capsExtensionString =
             "<c xmlns='http://jabber.org/protocol/caps'"
@@ -36,7 +38,7 @@ public class CapsExtensionProviderTest extends InitExtensions {
             + " node='http://foo.example.org/bar'"
             + " ver='QgayPKawpkPSDYmwt/WM94uA1u0='/>";
         // @formatter:on
-        CapsExtension capsExtension = TestUtils.parseExtensionElement(capsExtensionString);
+        CapsExtension capsExtension = SmackTestUtil.parse(capsExtensionString, CapsExtensionProvider.class, parserKind);
         assertNotNull(capsExtension);
     }
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
index 7a4c6756c..5b4b0eba0 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
@@ -32,6 +32,8 @@ import javax.xml.parsers.FactoryConfigurationError;
 
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.delay.DelayInformationManager;
@@ -40,8 +42,6 @@ import org.jivesoftware.smackx.delay.packet.DelayInformation;
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.Test;
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class DelayInformationTest extends InitExtensions {
 
@@ -76,7 +76,7 @@ public class DelayInformationTest extends InitExtensions {
         assertEquals(date, delayInfo.getStamp());
         assertEquals("Offline Storage", delayInfo.getReason());
 
-        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.getEventType());
         assertEquals("x", parser.getName());
 
         control = XMLBuilder.create("x")
@@ -92,7 +92,7 @@ public class DelayInformationTest extends InitExtensions {
         assertEquals(date, delayInfo.getStamp());
         assertNull(delayInfo.getReason());
 
-        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.getEventType());
         assertEquals("x", parser.getName());
 
     }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
index e24ad2ef4..59e8b42f4 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertThat;
 import java.util.Properties;
 
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.delay.packet.DelayInformation;
 import org.jivesoftware.smackx.forward.packet.Forwarded;
@@ -31,7 +32,6 @@ import org.jivesoftware.smackx.forward.provider.ForwardedProvider;
 
 import com.jamesmurty.utils.XMLBuilder;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class ForwardedTest {
 
@@ -62,7 +62,7 @@ public class ForwardedTest {
         assertThat("romeo@montague.com", equalsCharSequence(fwd.getForwardedStanza().getFrom()));
 
         // check end of tag
-        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.getEventType());
         assertEquals("forwarded", parser.getName());
     }
 
@@ -90,7 +90,7 @@ public class ForwardedTest {
         assertThat("romeo@montague.com", equalsCharSequence(fwd.getForwardedStanza().getFrom()));
 
         // check end of tag
-        assertEquals(XmlPullParser.END_TAG, parser.getEventType());
+        assertEquals(XmlPullParser.Event.END_ELEMENT, parser.getEventType());
         assertEquals("forwarded", parser.getName());
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java
index bd1a430a8..6023f257e 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java
@@ -22,6 +22,7 @@ import static junit.framework.TestCase.assertNotSame;
 import static junit.framework.TestCase.assertNull;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.jingle.element.JingleContent;
 
 import org.junit.Test;
@@ -31,7 +32,7 @@ import org.junit.Test;
  */
 public class JingleContentTest extends SmackTestSuite {
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void emptyBuilderThrowsTest() {
         JingleContent.Builder builder = JingleContent.getBuilder();
         builder.build();
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java
index 6ca6d88a9..3cd884199 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java
@@ -20,6 +20,7 @@ import static junit.framework.TestCase.assertEquals;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+
 import org.jivesoftware.smackx.jingle.element.JingleError;
 import org.jivesoftware.smackx.jingle.provider.JingleErrorProvider;
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java
index c7827e475..70933bde2 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java
@@ -41,7 +41,7 @@ public class JingleTest extends SmackTestSuite {
         builder.build();
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void onlySessionIdBuilderTest() {
         String sessionId = "testSessionId";
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java
index e10a879f2..0975d53aa 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleUtilTest.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.jingle;
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleContent;
 
@@ -45,6 +46,7 @@ public class JingleUtilTest extends SmackTestSuite {
         jutil = new JingleUtil(connection);
     }
 
+    @SuppressWarnings("UnusedVariable")
     @Test
     public void sessionInitiateTest() throws XmppStringprepException {
         FullJid romeo = connection.getUser().asFullJidOrThrow();
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManagerTest.java
index 4655a621b..6faa9bdc0 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManagerTest.java
@@ -20,6 +20,7 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNull;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.jingle.transports.jingle_ibb.element.JingleIBBTransport;
 import org.jivesoftware.smackx.jingle.transports.jingle_ibb.provider.JingleIBBTransportProvider;
 import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransport;
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java
index 68eb4ab57..294e37768 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java
@@ -21,14 +21,14 @@ import static org.junit.Assert.assertEquals;
 import java.io.IOException;
 
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingle.element.Jingle;
 import org.jivesoftware.smackx.jingle.element.JingleContentDescription;
 import org.jivesoftware.smackx.jingle.element.JingleContentTransport;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class JingleProviderTest {
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java
index 68ca37f06..86eb88041 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java
@@ -22,9 +22,11 @@ import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
 
-import org.jivesoftware.smack.test.util.SmackTestSuite;
+import java.net.UnknownHostException;
 
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransport;
 import org.jivesoftware.smackx.jingle.transports.jingle_s5b.elements.JingleS5BTransportCandidate;
@@ -89,7 +91,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
         assertNotNull(candidate1.getStreamHost());
         assertEquals(JingleS5BTransportCandidate.Type.direct.getWeight(), candidate1.getType().getWeight());
         assertEquals("hft54dqy", candidate1.getCandidateId());
-        assertEquals("192.168.4.1", candidate1.getHost());
+        assertEquals("192.168.4.1", candidate1.getHost().toString());
         assertEquals(JidCreate.from("romeo@montague.lit/orchard"), candidate1.getJid());
         assertEquals(5086, candidate1.getPort());
         assertEquals(8257636, candidate1.getPriority());
@@ -98,7 +100,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
         JingleS5BTransportCandidate candidate2 =
                 (JingleS5BTransportCandidate) transport.getCandidates().get(1);
         assertEquals("hutr46fe", candidate2.getCandidateId());
-        assertEquals("24.24.24.1", candidate2.getHost());
+        assertEquals("24.24.24.1", candidate2.getHost().toString());
         assertEquals(JidCreate.from("romeo@montague.lit/orchard"), candidate2.getJid());
         assertEquals(5087, candidate2.getPort());
         assertEquals(8258636, candidate2.getPriority());
@@ -107,7 +109,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
         JingleS5BTransportCandidate candidate3 =
                 (JingleS5BTransportCandidate) transport.getCandidates().get(2);
         assertEquals("xmdh4b7i", candidate3.getCandidateId());
-        assertEquals("123.456.7.8", candidate3.getHost());
+        assertEquals("123.456.7.8", candidate3.getHost().toString());
         assertEquals(JidCreate.domainBareFrom("streamer.shakespeare.lit"), candidate3.getJid());
         assertEquals(7625, candidate3.getPort());
         assertEquals(7878787, candidate3.getPriority());
@@ -187,15 +189,15 @@ public class JingleS5BTransportTest extends SmackTestSuite {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void transportCandidateIllegalPriorityTest() throws XmppStringprepException {
+    public void transportCandidateIllegalPriorityTest() throws XmppStringprepException, UnknownHostException {
         FullJid jid = JidCreate.fullFrom("test@test.test/test");
         @SuppressWarnings("unused")
         JingleS5BTransportCandidate candidate = new JingleS5BTransportCandidate(
-                "cid", "host", jid, 5555, -30, JingleS5BTransportCandidate.Type.proxy);
+                "cid", "localhost", jid, 5555, -30, JingleS5BTransportCandidate.Type.proxy);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void transportCandidateIllegalPortTest() throws XmppStringprepException {
+    public void transportCandidateIllegalPortTest() throws XmppStringprepException, UnknownHostException {
         FullJid jid = JidCreate.fullFrom("test@test.test/test");
         @SuppressWarnings("unused")
         JingleS5BTransportCandidate candidate = new JingleS5BTransportCandidate(
@@ -203,9 +205,9 @@ public class JingleS5BTransportTest extends SmackTestSuite {
     }
 
     @Test
-    public void candidateFromStreamHostTest() throws XmppStringprepException {
+    public void candidateFromStreamHostTest() throws XmppStringprepException, UnknownHostException {
         FullJid jid = JidCreate.fullFrom("test@test.test/test");
-        String host = "host.address";
+        String host = "localhost";
         int port = 1234;
         Bytestream.StreamHost streamHost = new Bytestream.StreamHost(jid, host, port);
 
@@ -213,7 +215,7 @@ public class JingleS5BTransportTest extends SmackTestSuite {
 
         assertEquals(2000, candidate.getPriority());
         assertEquals(jid, candidate.getJid());
-        assertEquals(host, candidate.getHost());
+        assertEquals(host, candidate.getHost().toString());
         assertEquals(port, candidate.getPort());
 
         assertEquals(streamHost.toXML().toString(), candidate.getStreamHost().toXML().toString());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java
index 59bee0cf0..74247bba1 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java
@@ -18,19 +18,20 @@ package org.jivesoftware.smackx.last_interaction;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.util.Date;
 
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.last_interaction.element.IdleElement;
 import org.jivesoftware.smackx.last_interaction.provider.IdleProvider;
 
 import org.junit.Test;
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
 
 public class IdleTest extends SmackTestSuite {
 
@@ -44,7 +45,7 @@ public class IdleTest extends SmackTestSuite {
         assertEquals(date, parsed.getSince());
 
         IdleElement element = new IdleElement(date);
-        assertXMLEqual("<idle xmlns='urn:xmpp:idle:1' since='1969-07-21T02:56:15.000+00:00'/>", element.toXML().toString());
+        assertXmlSimilar("<idle xmlns='urn:xmpp:idle:1' since='1969-07-21T02:56:15.000+00:00'/>", element.toXML().toString());
     }
 
     @Test
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProviderTest.java
new file mode 100644
index 000000000..0a0abbc11
--- /dev/null
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mediaelement/provider/MediaElementProviderTest.java
@@ -0,0 +1,78 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.mediaelement.provider;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.jivesoftware.smackx.mediaelement.element.MediaElement;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+public class MediaElementProviderTest {
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void simpleMediaElementTest(SmackTestUtil.XmlPullParserKind parserKind) throws XmlPullParserException, IOException, SmackParsingException {
+        final String xml =
+                        "<media xmlns='urn:xmpp:media-element' height='80' width='290'>" +
+                          "<uri type='audio/x-wav'>" +
+                            "http://victim.example.com/challenges/speech.wav?F3A6292C" +
+                          "</uri>" +
+                        "</media>";
+
+        MediaElement mediaElement = SmackTestUtil.parse(xml, MediaElementProvider.class, parserKind);
+        assertEquals(80, mediaElement.getHeight().intValue());
+        assertEquals(290, mediaElement.getWidth().intValue());
+
+        List<MediaElement.Uri> uris = mediaElement.getUris();
+        assertEquals(1, uris.size());
+
+        MediaElement.Uri uri = uris.get(0);
+        assertEquals("audio/x-wav", uri.getType());
+        assertEquals("http://victim.example.com/challenges/speech.wav?F3A6292C", uri.getUri().toString());
+    }
+
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void parseMediaElementTest(SmackTestUtil.XmlPullParserKind parserKind) throws XmlPullParserException, IOException, SmackParsingException {
+        final String xml =
+                        "<media xmlns='urn:xmpp:media-element'>" +
+                          "<uri type='audio/x-wav'>" +
+                            "http://victim.example.com/challenges/speech.wav?F3A6292C" +
+                          "</uri>" +
+                          "<uri type='audio/ogg; codecs=speex'>" +
+                             "cid:sha1+a15a505e360702b79c75a5f67773072ed392f52a@bob.xmpp.org" +
+                          "</uri>" +
+                          "<uri type='audio/mpeg'>" +
+                            "http://victim.example.com/challenges/speech.mp3?F3A6292C" +
+                          "</uri>" +
+                        "</media>";
+
+        MediaElement mediaElement = SmackTestUtil.parse(xml, MediaElementProvider.class, parserKind);
+
+        List<MediaElement.Uri> uris = mediaElement.getUris();
+        assertEquals(3, uris.size());
+    }
+}
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
index 5d6247e28..86b63780e 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java
@@ -16,12 +16,13 @@
  */
 package org.jivesoftware.smackx.message_correct;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.PacketParserUtils;
 
 import org.jivesoftware.smackx.message_correct.element.MessageCorrectExtension;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 public class MessageCorrectExtensionTest {
@@ -42,11 +43,11 @@ public class MessageCorrectExtensionTest {
         Message initialMessage = PacketParserUtils.parseStanza(initialMessageXml);
         MessageCorrectExtension messageCorrectExtension = new MessageCorrectExtension(idInitialMessage);
 
-        Assert.assertEquals(messageCorrectExtension.toXML().toString(), messageCorrectionXml.toString());
+        assertEquals(messageCorrectExtension.toXML().toString(), messageCorrectionXml.toString());
 
         initialMessage.addExtension(messageCorrectExtension);
 
-        Assert.assertEquals(initialMessage.toXML().toString(), expectedXml.toString());
+        assertEquals(initialMessage.toXML().toString(), expectedXml.toString());
     }
 
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java
index 346b990bf..0c9c83c93 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodConcretisationTest.java
@@ -19,18 +19,19 @@ package org.jivesoftware.smackx.mood;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.mood.element.MoodConcretisation;
 import org.jivesoftware.smackx.mood.element.MoodElement;
 import org.jivesoftware.smackx.mood.provider.MoodProvider;
 import org.jivesoftware.smackx.mood.provider.SimpleMoodConcretisationProvider;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * This test checks, if extending XEP-0107: User Mood using custom mood concretisations works.
@@ -60,11 +61,11 @@ public class MoodConcretisationTest extends SmackTestSuite {
                         new EcstaticMoodConcretisation()),
                 "Yay, the mood spec has been approved!");
 
-        assertXMLEqual(xml, element.toXML().toString());
+        assertXmlSimilar(xml, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(xml);
         MoodElement parsed = MoodProvider.INSTANCE.parse(parser);
-        assertXMLEqual(xml, parsed.toXML().toString());
+        assertXmlSimilar(xml, parsed.toXML().toString());
 
         assertTrue(parsed.hasConcretisation());
         assertTrue(parsed.hasText());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java
index 9916cfaf1..59dc3d30f 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodElementTest.java
@@ -19,16 +19,17 @@ package org.jivesoftware.smackx.mood;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNull;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.mood.element.MoodElement;
 import org.jivesoftware.smackx.mood.provider.MoodProvider;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class MoodElementTest extends SmackTestSuite {
 
@@ -41,7 +42,7 @@ public class MoodElementTest extends SmackTestSuite {
                 "</mood>";
         MoodElement moodElement = new MoodElement(new MoodElement.MoodSubjectElement(Mood.happy, null), "Yay, the mood spec has been approved!");
 
-        assertXMLEqual(xml, moodElement.toXML().toString());
+        assertXmlSimilar(xml, moodElement.toXML().toString());
         assertFalse(moodElement.hasConcretisation());
         assertEquals(Mood.happy, moodElement.getMood());
 
@@ -52,7 +53,7 @@ public class MoodElementTest extends SmackTestSuite {
 
     @Test(expected = IllegalArgumentException.class)
     public void illegalArgumentsTest() {
-        MoodElement element = new MoodElement(null, "Text alone is not allowed.");
+        new MoodElement(null, "Text alone is not allowed.");
     }
 
     @Test
@@ -77,6 +78,6 @@ public class MoodElementTest extends SmackTestSuite {
                     "<unknown/>" +
                 "</mood>";
         XmlPullParser parser = TestUtils.getParser(xml);
-        MoodElement element = MoodProvider.INSTANCE.parse(parser);
+        MoodProvider.INSTANCE.parse(parser);
     }
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodManagerTest.java
index 943371b12..a650bc7b5 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodManagerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/mood/MoodManagerTest.java
@@ -23,6 +23,7 @@ import static junit.framework.TestCase.assertTrue;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.mood.element.MoodElement;
 
 import org.junit.Test;
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java
index cb14153bc..ddf453218 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java
@@ -42,17 +42,17 @@ public class RoomInfoTest {
     public void validateRoomWithForm() {
         DataForm dataForm = new DataForm(DataForm.Type.result);
 
-        FormField desc = new FormField("muc#roominfo_description");
+        FormField.Builder desc = FormField.builder("muc#roominfo_description");
         desc.addValue("The place for all good witches!");
-        dataForm.addField(desc);
+        dataForm.addField(desc.build());
 
-        FormField subject = new FormField("muc#roominfo_subject");
+        FormField.Builder subject = FormField.builder("muc#roominfo_subject");
         subject.addValue("Spells");
-        dataForm.addField(subject);
+        dataForm.addField(subject.build());
 
-        FormField occupants = new FormField("muc#roominfo_occupants");
+        FormField.Builder occupants = FormField.builder("muc#roominfo_occupants");
         occupants.addValue("3");
-        dataForm.addField(occupants);
+        dataForm.addField(occupants.build());
 
         DiscoverInfo discoInfo = new DiscoverInfo();
         discoInfo.addExtension(dataForm);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java
index 9903d38d2..3a8ede436 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2012 Florian Schmaus
+ * Copyright 2012-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,9 +40,9 @@ public class PrivacyProviderTest extends InitExtensions {
         "<iq type='result' id='getlist2' to='romeo@example.net/orchard'>"
           + "<query xmlns='jabber:iq:privacy'>"
           + "<list name='public'>"
-          + "<item type='jid'"
-          + "value='tybalt@example.com'"
-          + "action='deny'"
+          + "<item type='jid' "
+          + "value='tybalt@example.com' "
+          + "action='deny' "
           + "order='1'/>"
           + "<item action='allow' order='2'/>"
           + "</list>"
@@ -59,11 +59,11 @@ public class PrivacyProviderTest extends InitExtensions {
         assertEquals(PrivacyItem.Type.jid, first.getType());
         assertEquals("tybalt@example.com", first.getValue());
         assertEquals(false, first.isAllow());
-        assertEquals(1, first.getOrder());
+        assertEquals(1L, first.getOrder().nativeRepresentation());
 
         PrivacyItem second = pl.get(1);
         assertEquals(true, second.isAllow());
-        assertEquals(2, second.getOrder());
+        assertEquals(2L, second.getOrder().nativeRepresentation());
     }
 
     @Test
@@ -73,9 +73,9 @@ public class PrivacyProviderTest extends InitExtensions {
         "<iq type='result' id='getlist2' to='romeo@example.net/orchard'>"
           + "<query xmlns='jabber:iq:privacy'>"
           + "<list name='public'>"
-          + "<item type='jid'"
-          + "value='tybalt@example.com'"
-          + "action='deny'"
+          + "<item type='jid' "
+          + "value='tybalt@example.com' "
+          + "action='deny' "
           + "order='1'/>"
           + "<item action='allow' order='2'>"
             + "<message/>"
@@ -95,11 +95,11 @@ public class PrivacyProviderTest extends InitExtensions {
         assertEquals(PrivacyItem.Type.jid, first.getType());
         assertEquals("tybalt@example.com", first.getValue());
         assertEquals(false, first.isAllow());
-        assertEquals(1, first.getOrder());
+        assertEquals(1L, first.getOrder().nativeRepresentation());
 
         PrivacyItem second = pl.get(1);
         assertTrue(second.isAllow());
-        assertEquals(2, second.getOrder());
+        assertEquals(2L, second.getOrder().nativeRepresentation());
         assertTrue(second.isFilterMessage());
         assertTrue(second.isFilterPresenceIn());
         assertFalse(second.isFilterPresenceOut());
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java
index 079733aab..bbbed2771 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.pubsub;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,7 +42,7 @@ public class AffiliationsExtensionTest {
 
         CharSequence xml = affiliationsExtension.toXML();
 
-        assertXMLEqual("<affiliations node='testNode'><affiliation xmlns='http://jabber.org/protocol/pubsub#owner' jid='one@exampleone.org' affiliation='member'/></affiliations>",
+        assertXmlSimilar("<affiliations node='testNode'><affiliation xmlns='http://jabber.org/protocol/pubsub#owner' jid='one@exampleone.org' affiliation='member'/></affiliations>",
                         xml.toString());
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
index 729e2a12d..96034f920 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java
@@ -36,7 +36,6 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity;
 import org.jivesoftware.smackx.pubsub.packet.PubSub;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -77,7 +76,7 @@ public class ConfigureFormTest extends InitExtensions {
             fail();
         }
         catch (XMPPErrorException e) {
-            Assert.assertEquals(StanzaError.Type.AUTH, e.getStanzaError().getType());
+            assertEquals(StanzaError.Type.AUTH, e.getStanzaError().getType());
         }
     }
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
index 1d81bf4c9..631a64ac0 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smackx.pubsub;
 
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -25,6 +25,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
@@ -32,7 +33,6 @@ import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Item validation test.
@@ -62,15 +62,15 @@ public class ItemValidationTest extends InitExtensions {
     public void verifyBasicItem() throws Exception {
         Item simpleItem = new Item();
         String simpleCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' />";
-        assertXMLEqual(simpleCtrl, simpleItem.toXML().toString());
+        assertXmlSimilar(simpleCtrl, simpleItem.toXML().toString());
 
         Item idItem = new Item("uniqueid");
         String idCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='uniqueid'/>";
-        assertXMLEqual(idCtrl, idItem.toXML().toString());
+        assertXmlSimilar(idCtrl, idItem.toXML().toString());
 
         Item itemWithNodeId = new Item("testId", "testNode");
         String nodeIdCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='testId' node='testNode' />";
-        assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML().toString());
+        assertXmlSimilar(nodeIdCtrl, itemWithNodeId.toXML().toString());
     }
 
     @Test
@@ -79,15 +79,15 @@ public class ItemValidationTest extends InitExtensions {
 
         PayloadItem<SimplePayload> simpleItem = new PayloadItem<>(payload);
         String simpleCtrl = "<item xmlns='http://jabber.org/protocol/pubsub'>" + payload.toXML() + "</item>";
-        assertXMLEqual(simpleCtrl, simpleItem.toXML().toString());
+        assertXmlSimilar(simpleCtrl, simpleItem.toXML().toString());
 
         PayloadItem<SimplePayload> idItem = new PayloadItem<>("uniqueid", payload);
         String idCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='uniqueid'>" + payload.toXML() + "</item>";
-        assertXMLEqual(idCtrl, idItem.toXML().toString());
+        assertXmlSimilar(idCtrl, idItem.toXML().toString());
 
         PayloadItem<SimplePayload> itemWithNodeId = new PayloadItem<>("testId", "testNode", payload);
         String nodeIdCtrl = "<item xmlns='http://jabber.org/protocol/pubsub' id='testId' node='testNode'>" + payload.toXML() + "</item>";
-        assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML().toString());
+        assertXmlSimilar(nodeIdCtrl, itemWithNodeId.toXML().toString());
     }
 
     @Test
@@ -145,7 +145,7 @@ public class ItemValidationTest extends InitExtensions {
         SimplePayload payload = (SimplePayload) item.getPayload();
         assertEquals("foo", payload.getElementName());
         assertEquals("smack:test", payload.getNamespace());
-        assertXMLEqual(itemContent, payload.toXML().toString());
+        assertXmlSimilar(itemContent, payload.toXML().toString());
     }
 
     @Test
@@ -191,7 +191,7 @@ public class ItemValidationTest extends InitExtensions {
         SimplePayload payload = (SimplePayload) item.getPayload();
         assertEquals("entry", payload.getElementName());
         assertEquals("http://www.w3.org/2005/Atom", payload.getNamespace());
-        assertXMLEqual(itemContent, payload.toXML().toString());
+        assertXmlSimilar(itemContent, payload.toXML().toString());
     }
 
     @Test
@@ -226,6 +226,6 @@ public class ItemValidationTest extends InitExtensions {
         assertEquals("testid1", item.getId());
         assertTrue(item.getPayload() instanceof SimplePayload);
 
-        assertXMLEqual(itemContent, item.getPayload().toXML().toString());
+        assertXmlSimilar(itemContent, item.getPayload().toXML().toString());
     }
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java
index 3d2341a9b..cb518220d 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java
@@ -30,6 +30,7 @@ import org.jivesoftware.smack.packet.IQ.Type;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.pubsub.Affiliation.AffiliationNamespace;
 import org.jivesoftware.smackx.pubsub.packet.PubSub;
@@ -40,7 +41,6 @@ import org.jivesoftware.util.Protocol;
 import org.junit.Test;
 import org.jxmpp.jid.JidTestUtil;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
 
 public class PubSubNodeTest extends SmackTestSuite {
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/PubSubProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/PubSubProviderTest.java
index 865b185fb..59f33e43d 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/PubSubProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/provider/PubSubProviderTest.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.pubsub.PubSubElementType;
 import org.jivesoftware.smackx.pubsub.Subscription;
@@ -31,7 +32,6 @@ import org.jivesoftware.smackx.pubsub.SubscriptionsExtension;
 import org.jivesoftware.smackx.pubsub.packet.PubSub;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class PubSubProviderTest {
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
index b1b06a982..645b54271 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
@@ -30,6 +30,7 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.test.util.WaitForPacketListener;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.receipts.DeliveryReceiptManager.AutoReceiptMode;
@@ -38,7 +39,6 @@ import com.jamesmurty.utils.XMLBuilder;
 import org.junit.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
 
 public class DeliveryReceiptTest extends InitExtensions {
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java
index ab9c66350..7a5c2ab55 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/shim/provider/HeadersProviderTest.java
@@ -21,12 +21,12 @@ import static org.junit.Assert.assertEquals;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.shim.packet.Header;
 import org.jivesoftware.smackx.shim.packet.HeadersExtension;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 public class HeadersProviderTest {
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java
index 5d852f0f1..3cc6ed46b 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/provider/TimeProviderTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014 Florian Schmaus
+ * Copyright 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,9 @@ public class TimeProviderTest {
     public void parseTimeWithIntrospectionTest() throws Exception {
         // @formatter:off
         final String request =
-        "<iq type='get'"
-          + "from='romeo@montague.net/orchard'"
-          + "to='juliet@capulet.com/balcony'"
+        "<iq type='get' "
+          + "from='romeo@montague.net/orchard' "
+          + "to='juliet@capulet.com/balcony' "
           + "id='time_1'>"
           + "<time xmlns='urn:xmpp:time'/>"
           + "</iq>";
@@ -44,9 +44,9 @@ public class TimeProviderTest {
 
         // @formatter:off
         final String response =
-        "<iq type='result'"
-          + "from='juliet@capulet.com/balcony'"
-          + "to='romeo@montague.net/orchard'"
+        "<iq type='result' "
+          + "from='juliet@capulet.com/balcony' "
+          + "to='romeo@montague.net/orchard' "
           + "id='time_1'>"
           + "<time xmlns='urn:xmpp:time'>"
           + "<tzo>-06:00</tzo>"
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
index 5500125e9..5a16cb36d 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java
@@ -20,7 +20,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.jivesoftware.smack.packet.Element;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.FormField.Type;
@@ -33,7 +35,6 @@ import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RangeValidateElement;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Unit tests for DataForm reading and parsing.
@@ -41,9 +42,9 @@ import org.xmlpull.v1.XmlPullParser;
  * @author Anno van Vliet
  *
  */
-public class DataFormTest {
-    private static final String TEST_OUTPUT_1 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'></field></x>";
-    private static final String TEST_OUTPUT_2 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'></field><page xmlns='http://jabber.org/protocol/xdata-layout' label='Label'><fieldref var='testField1'/><section label='section Label'><text>SectionText</text></section><text>PageText</text></page></x>";
+public class DataFormTest extends SmackTestSuite {
+    private static final String TEST_OUTPUT_1 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'/></x>";
+    private static final String TEST_OUTPUT_2 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'/><page xmlns='http://jabber.org/protocol/xdata-layout' label='Label'><fieldref var='testField1'/><section label='section Label'><text>SectionText</text></section><text>PageText</text></page></x>";
     private static final String TEST_OUTPUT_3 = "<x xmlns='jabber:x:data' type='submit'><instructions>InstructionTest1</instructions><field var='testField1'><validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:integer'><range min='1111' max='9999'/></validate></field></x>";
 
     private static final DataFormProvider pr = new DataFormProvider();
@@ -54,7 +55,7 @@ public class DataFormTest {
         DataForm df = new DataForm(DataForm.Type.submit);
         String instruction = "InstructionTest1";
         df.addInstruction(instruction);
-        FormField field = new FormField("testField1");
+        FormField field = FormField.builder("testField1").build();
         df.addField(field);
 
         assertNotNull(df.toXML());
@@ -81,7 +82,7 @@ public class DataFormTest {
         DataForm df = new DataForm(DataForm.Type.submit);
         String instruction = "InstructionTest1";
         df.addInstruction(instruction);
-        FormField field = new FormField("testField1");
+        FormField field = FormField.builder("testField1").build();
         df.addField(field);
 
         DataLayout layout = new DataLayout("Label");
@@ -123,11 +124,12 @@ public class DataFormTest {
         DataForm df = new DataForm(DataForm.Type.submit);
         String instruction = "InstructionTest1";
         df.addInstruction(instruction);
-        FormField field = new FormField("testField1");
-        df.addField(field);
+        FormField.Builder fieldBuilder = FormField.builder("testField1");
 
-        ValidateElement dv = new RangeValidateElement("xs:integer","1111", "9999");
-        field.setValidateElement(dv);
+        ValidateElement dv = new RangeValidateElement("xs:integer", "1111", "9999");
+        fieldBuilder.addFormFieldChildElement(dv);
+
+        df.addField(fieldBuilder.build());
 
         assertNotNull(df.toXML());
         String output = df.toXML().toString();
@@ -140,7 +142,7 @@ public class DataFormTest {
         assertNotNull(df);
         assertNotNull(df.getFields());
         assertEquals(1 , df.getFields().size());
-        Element element = df.getFields().get(0).getValidateElement();
+        Element element = ValidateElement.from(df.getFields().get(0));
         assertNotNull(element);
         dv = (ValidateElement) element;
 
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java
index 08820fc2f..ea36db948 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java
@@ -23,6 +23,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 import org.jivesoftware.smackx.xdata.provider.DataFormProvider;
@@ -33,8 +35,6 @@ import org.jivesoftware.smackx.xdatalayout.packet.DataLayout.Text;
 import org.jivesoftware.smackx.xdatalayout.provider.DataLayoutProvider;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Unit tests for DataForm reading and parsing.
@@ -143,9 +143,8 @@ public class DataLayoutTest {
     public void testLayoutFromFile() throws Exception {
         DataFormProvider pr = new DataFormProvider();
 
-        XmlPullParser parser = PacketParserUtils.newXmppParser();
-        parser.setInput(new InputStreamReader(this.getClass().getResourceAsStream(TEST_INPUT_1), "UTF-8"));
-        parser.next();
+        InputStreamReader inputStreamReader = new InputStreamReader(this.getClass().getResourceAsStream(TEST_INPUT_1), "UTF-8");
+        XmlPullParser parser = PacketParserUtils.getParserFor(inputStreamReader);
 
         DataForm form = pr.parse(parser);
         assertNotNull(form);
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/DataValidationHelperTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/DataValidationHelperTest.java
index 84ee4117e..c4b5beae8 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/DataValidationHelperTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/DataValidationHelperTest.java
@@ -17,7 +17,7 @@
 package org.jivesoftware.smackx.xdatavalidation;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.BasicValidateElement;
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.OpenValida
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RangeValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RegexValidateElement;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Data validation helper test.
@@ -35,81 +35,55 @@ import org.junit.Test;
  */
 public class DataValidationHelperTest {
 
-
     @Test
     public void testCheckConsistencyFormFieldBasicValidateElement() {
-        FormField field = new FormField("var");
-        field.setType(FormField.Type.jid_single);
+        FormField.Builder field = FormField.builder("var")
+                        .setType(FormField.Type.jid_single);
         BasicValidateElement element = new BasicValidateElement(null);
-        try {
-            element.checkConsistency(field);
-            fail("No correct check on consistency");
-        }
-        catch (ValidationConsistencyException e) {
-            assertEquals("Field type 'jid-single' is not consistent with validation method 'basic'.", e.getMessage());
-        }
+        ValidationConsistencyException vce = assertThrows(ValidationConsistencyException.class,
+                        () -> element.checkConsistency(field));
+        assertEquals("Field type 'jid-single' is not consistent with validation method 'basic'.", vce.getMessage());
 
-        try {
-            new ListRange(-1L, 1L);
-            fail("No correct check on consistency");
-        }
-        catch (IllegalArgumentException e) {
-            assertEquals("unsigned 32-bit integers can't be negative", e.getMessage());
-        }
+        IllegalArgumentException iae = assertThrows(IllegalArgumentException.class,
+                        () -> new ListRange(-1L, 1L));
+        assertEquals("unsigned 32-bit integers can't be negative", iae.getMessage());
 
         element.setListRange(new ListRange(10L, 100L));
-        try {
-            element.checkConsistency(field);
-            fail("No correct check on consistency");
-        }
-        catch (ValidationConsistencyException e) {
-            assertEquals("Field type is not of type 'list-multi' while a 'list-range' is defined.", e.getMessage());
-        }
+        vce = assertThrows(ValidationConsistencyException.class, () -> element.checkConsistency(field));
+        assertEquals("Field type is not of type 'list-multi' while a 'list-range' is defined.", vce.getMessage());
 
-        field.setType(FormField.Type.list_multi);
-        element.checkConsistency(field);
+        FormField.Builder fieldListMulti = field.setType(FormField.Type.list_multi);
+        element.checkConsistency(fieldListMulti);
     }
 
 
     @Test
     public void testCheckConsistencyFormFieldOpenValidateElement() {
-        FormField field = new FormField("var");
-        field.setType(FormField.Type.hidden);
+        FormField.Builder field = FormField.builder("var")
+                        .setType(FormField.Type.hidden);
         OpenValidateElement element = new OpenValidateElement(null);
-        try {
-            element.checkConsistency(field);
-            fail("No correct check on consistency");
-        }
-        catch (ValidationConsistencyException e) {
-            assertEquals("Field type 'hidden' is not consistent with validation method 'open'.", e.getMessage());
-        }
+        ValidationConsistencyException e = assertThrows(ValidationConsistencyException.class,
+                        () -> element.checkConsistency(field));
+        assertEquals("Field type 'hidden' is not consistent with validation method 'open'.", e.getMessage());
     }
 
     @Test
     public void testCheckConsistencyFormFieldRangeValidateElement() {
-        FormField field = new FormField("var");
-        field.setType(FormField.Type.text_multi);
-        RangeValidateElement element = new RangeValidateElement("xs:integer",null, "99");
-        try {
-            element.checkConsistency(field);
-            fail("No correct check on consistency");
-        }
-        catch (ValidationConsistencyException e) {
-            assertEquals("Field type 'text-multi' is not consistent with validation method 'range'.", e.getMessage());
-        }
+        FormField.Builder field = FormField.builder("var")
+                        .setType(FormField.Type.text_multi);
+        RangeValidateElement element = new RangeValidateElement("xs:integer", null,  "99");
+        ValidationConsistencyException e = assertThrows(ValidationConsistencyException.class,
+                        () -> element.checkConsistency(field));
+        assertEquals("Field type 'text-multi' is not consistent with validation method 'range'.", e.getMessage());
     }
 
     @Test
     public void testCheckConsistencyFormFieldRegexValidateElement() {
-        FormField field = new FormField("var");
-        field.setType(FormField.Type.list_multi);
+        FormField.Builder field = FormField.builder("var")
+                        .setType(FormField.Type.list_multi);
         RegexValidateElement element = new RegexValidateElement(null, ".*");
-        try {
-            element.checkConsistency(field);
-            fail("No correct check on consistency");
-        }
-        catch (ValidationConsistencyException e) {
-            assertEquals("Field type 'list-multi' is not consistent with validation method 'regex'.", e.getMessage());
-        }
+        ValidationConsistencyException e = assertThrows(ValidationConsistencyException.class,
+                        () -> element.checkConsistency(field));
+        assertEquals("Field type 'list-multi' is not consistent with validation method 'regex'.", e.getMessage());
     }
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java
index e8e272d05..522a72f08 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014 Anno van Vliet, 2018 Florian Schmaus
+ * Copyright 2014 Anno van Vliet, 2018-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,28 +19,33 @@ package org.jivesoftware.smackx.xdatavalidation.provider;
  import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 
-import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.test.util.SmackTestSuite;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
+import org.jivesoftware.smackx.xdata.provider.DataFormProvider;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.BasicValidateElement;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.ListRange;
 import org.jivesoftware.smackx.xdatavalidation.packet.ValidateElement.RangeValidateElement;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 /**
  * Data validation test.
  * @author Anno van Vliet
  *
  */
-public class DataValidationTest {
+public class DataValidationTest extends SmackTestSuite {
     private static final String TEST_INPUT_MIN = "<validate xmlns='http://jabber.org/protocol/xdata-validate'></validate>";
     private static final String TEST_OUTPUT_MIN = "<validate xmlns='http://jabber.org/protocol/xdata-validate'><basic/></validate>";
     private static final String TEST_OUTPUT_RANGE = "<validate xmlns='http://jabber.org/protocol/xdata-validate' datatype='xs:string'><range min='min-val' max='max-val'/><list-range min='111' max='999'/></validate>";
@@ -48,42 +53,50 @@ public class DataValidationTest {
     private static final String TEST_OUTPUT_FAIL = "<validate xmlns='http://jabber.org/protocol/xdata-validate'><list-range min='1-1-1' max='999'/></validate>";
 
     @Test
-    public void testMin() throws XmlPullParserException, IOException {
-
+    public void testBasic() {
         ValidateElement dv = new BasicValidateElement(null);
 
         assertNotNull(dv.toXML());
         String output = dv.toXML().toString();
         assertEquals(TEST_OUTPUT_MIN, output);
+    }
 
-        XmlPullParser parser = getParser(TEST_INPUT_MIN);
-
-        dv = DataValidationProvider.parse(parser);
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testMin(SmackTestUtil.XmlPullParserKind parserKind) throws XmlPullParserException, IOException, SmackParsingException {
+        ValidateElement dv = SmackTestUtil.parse(TEST_INPUT_MIN, DataValidationProvider.class, parserKind);
 
         assertNotNull(dv);
         assertEquals("xs:string", dv.getDatatype());
         assertTrue(dv instanceof BasicValidateElement);
 
         assertNotNull(dv.toXML());
-        output = dv.toXML().toString();
+        String output = dv.toXML().toString();
         assertEquals(TEST_OUTPUT_MIN, output);
     }
 
     @Test
-    public void testRange() throws XmlPullParserException, IOException {
-
+    public void testRangeToXml() {
         ValidateElement dv = new RangeValidateElement("xs:string", "min-val", "max-val");
-
         ListRange listRange = new ListRange(111L, 999L);
         dv.setListRange(listRange);
 
         assertNotNull(dv.toXML());
         String output = dv.toXML().toString();
         assertEquals(TEST_OUTPUT_RANGE, output);
+    }
 
-        XmlPullParser parser = getParser(output);
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testRange(SmackTestUtil.XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        ValidateElement dv = new RangeValidateElement("xs:string", "min-val", "max-val");
+        ListRange listRange = new ListRange(111L, 999L);
+        dv.setListRange(listRange);
 
-        dv = DataValidationProvider.parse(parser);
+        String xml = dv.toXML().toString();
+
+        dv = SmackTestUtil.parse(xml, DataValidationProvider.class, parserKind);
 
         assertNotNull(dv);
         assertEquals("xs:string", dv.getDatatype());
@@ -92,27 +105,30 @@ public class DataValidationTest {
         assertEquals("min-val", rdv.getMin());
         assertEquals("max-val", rdv.getMax());
         assertNotNull(rdv.getListRange());
-        assertEquals(Long.valueOf(111), rdv.getListRange().getMin());
-        assertEquals(999, rdv.getListRange().getMax().intValue());
-
+        assertEquals(111L, rdv.getListRange().getMin().nativeRepresentation());
+        assertEquals(999L, rdv.getListRange().getMax().nativeRepresentation());
 
         assertNotNull(dv.toXML());
-        output = dv.toXML().toString();
-        assertEquals(TEST_OUTPUT_RANGE, output);
+        xml = dv.toXML().toString();
+        assertEquals(TEST_OUTPUT_RANGE, xml);
     }
 
     @Test
-    public void testRange2() throws XmlPullParserException, IOException {
-
+    public void testRange2ToXml() {
         ValidateElement dv = new RangeValidateElement(null, null, null);
 
         assertNotNull(dv.toXML());
         String output = dv.toXML().toString();
         assertEquals(TEST_OUTPUT_RANGE2, output);
+    }
 
-        XmlPullParser parser = getParser(output);
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testRange2(SmackTestUtil.XmlPullParserKind parserKind) throws XmlPullParserException, IOException, SmackParsingException {
+        ValidateElement dv = new RangeValidateElement(null, null, null);
+        String xml = dv.toXML().toString();
 
-        dv = DataValidationProvider.parse(parser);
+        dv = SmackTestUtil.parse(xml, DataValidationProvider.class, parserKind);
 
         assertNotNull(dv);
         assertEquals("xs:string", dv.getDatatype());
@@ -122,18 +138,20 @@ public class DataValidationTest {
         assertEquals(null, rdv.getMax());
 
         assertNotNull(rdv.toXML());
-        output = rdv.toXML().toString();
-        assertEquals(TEST_OUTPUT_RANGE2, output);
+        xml = rdv.toXML().toString();
+        assertEquals(TEST_OUTPUT_RANGE2, xml);
     }
 
-    @Test(expected = NumberFormatException.class)
-    public void testRangeFailure() throws IOException, XmlPullParserException {
-            XmlPullParser parser = getParser(TEST_OUTPUT_FAIL);
-            DataValidationProvider.parse(parser);
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testRangeFailure(SmackTestUtil.XmlPullParserKind parserKind) throws IOException, XmlPullParserException {
+        assertThrows(NumberFormatException.class,
+                        () -> SmackTestUtil.parse(TEST_OUTPUT_FAIL, DataValidationProvider.class, parserKind));
     }
 
-    @Test
-    public void testNamespacePrefix() throws Exception {
+    @ParameterizedTest
+    @EnumSource(SmackTestUtil.XmlPullParserKind.class)
+    public void testNamespacePrefix(SmackTestUtil.XmlPullParserKind parserKind) throws Exception {
         String formFieldUsingNamespacePrefix =
                 "<x xmlns='jabber:x:data'" +
                 "   xmlns:xdv='http://jabber.org/protocol/xdata-validate'" +
@@ -155,7 +173,7 @@ public class DataValidationTest {
                 "  </field>" +
                 "</x>";
 
-        DataForm dataForm = TestUtils.parseExtensionElement(formFieldUsingNamespacePrefix);
+        DataForm dataForm = SmackTestUtil.parse(formFieldUsingNamespacePrefix, DataFormProvider.class, parserKind);
 
         assertEquals("Sample Form", dataForm.getTitle());
 
@@ -163,18 +181,8 @@ public class DataValidationTest {
         assertEquals("Event Name", nameField.getLabel());
 
         FormField dataStartField = dataForm.getField("date/start");
-        ValidateElement dataStartValidateElement = dataStartField.getValidateElement();
+        ValidateElement dataStartValidateElement = ValidateElement.from(dataStartField);
         assertEquals("xs:date", dataStartValidateElement.getDatatype());
         assertTrue(dataStartValidateElement instanceof BasicValidateElement);
     }
-
-    /**
-     * @param output
-     * @return
-     * @throws XmlPullParserException
-     * @throws IOException
-     */
-    private static XmlPullParser getParser(String output) throws XmlPullParserException, IOException {
-        return TestUtils.getParser(output, "validate");
-    }
 }
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java
index dc422ff59..41acbece8 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java
@@ -21,24 +21,24 @@ import static org.jivesoftware.smack.test.util.CharSequenceEquals.equalsCharSequ
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 
 public class XHTMLExtensionProviderTest {
     public static final String XHTML_EXTENSION_SAMPLE_RESOURCE_NAME = "xhtml.xml";
 
     @Test
     public void parsesWell() throws IOException, XmlPullParserException {
-        XmlPullParser parser = PacketParserUtils.newXmppParser();
-        parser.setInput(getClass().getResourceAsStream(XHTML_EXTENSION_SAMPLE_RESOURCE_NAME), "UTF-8");
+        InputStream inputStream = getClass().getResourceAsStream(XHTML_EXTENSION_SAMPLE_RESOURCE_NAME);
+        XmlPullParser parser = PacketParserUtils.getParserFor(inputStream);
         parser.next();
 
         XHTMLExtensionProvider provider = new XHTMLExtensionProvider();
diff --git a/smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 000000000..1f0955d45
--- /dev/null
+++ b/smack-extensions/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
index 77070934a..d2571358b 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
@@ -20,7 +20,6 @@ package org.jivesoftware.smack.chat;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -42,6 +41,7 @@ import org.jivesoftware.smack.filter.ThreadFilter;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Message.Type;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.util.StringUtils;
 
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityJid;
@@ -155,9 +155,7 @@ public final class ChatManager extends Manager{
                 Message message = (Message) packet;
                 Chat chat;
                 if (message.getThread() == null) {
-                    // CHECKSTYLE:OFF
-                	chat = getUserChat(message.getFrom());
-                    // CHECKSTYLE:ON
+                    chat = getUserChat(message.getFrom());
                 }
                 else {
                     chat = getThreadChat(message.getThread());
@@ -409,7 +407,7 @@ public final class ChatManager extends Manager{
      * @return the next id.
      */
     private static String nextID() {
-        return UUID.randomUUID().toString();
+        return StringUtils.secureUniqueRandomString();
     }
 
     public static void setDefaultMatchMode(MatchMode mode) {
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
index 04cf9cb89..1a861c780 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
@@ -1414,7 +1414,7 @@ public final class Roster extends Manager {
         move(user, presenceMap, nonRosterPresenceMap);
         deletedEntries.add(user);
 
-        for (Entry<String,RosterGroup> e : groups.entrySet()) {
+        for (Entry<String, RosterGroup> e : groups.entrySet()) {
             RosterGroup group = e.getValue();
             group.removeEntryLocal(entry);
             if (group.getEntryCount() == 0) {
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
index df59e379a..a75a024ac 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
@@ -31,6 +31,7 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.Presence.Type;
 import org.jivesoftware.smack.roster.packet.RosterPacket;
+import org.jivesoftware.smack.util.EqualsUtil;
 
 import org.jxmpp.jid.BareJid;
 
@@ -251,15 +252,9 @@ public final class RosterEntry extends Manager {
 
     @Override
     public boolean equals(Object object) {
-        if (this == object) {
-            return true;
-        }
-        if (object != null && object instanceof RosterEntry) {
-            return getJid().equals(((RosterEntry) object).getJid());
-        }
-        else {
-            return false;
-        }
+        return EqualsUtil.equals(this, object, (e, o) ->
+            e.append(getJid(), o.getJid())
+        );
     }
 
     /**
@@ -272,14 +267,9 @@ public final class RosterEntry extends Manager {
      *         otherwise.
      */
     public boolean equalsDeep(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        RosterEntry other = (RosterEntry) obj;
-        return other.item.equals(this.item);
+        return EqualsUtil.equals(this, obj, (e, o) ->
+            e.append(item, o.item)
+        );
     }
 
     /**
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java
index 12a751aec..430fa3434 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java
@@ -27,6 +27,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.NamedElement;
 import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smack.util.EqualsUtil;
+import org.jivesoftware.smack.util.HashCode;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
@@ -292,51 +294,26 @@ public final class RosterPacket extends IQ {
 
         @Override
         public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((groupNames == null) ? 0 : groupNames.hashCode());
-            result = prime * result + (subscriptionPending ? 0 : 1);
-            result = prime * result + ((itemType == null) ? 0 : itemType.hashCode());
-            result = prime * result + ((name == null) ? 0 : name.hashCode());
-            result = prime * result + ((jid == null) ? 0 : jid.hashCode());
-            result = prime * result + ((approved == false) ? 0 : 1);
-            return result;
+            return HashCode.builder()
+                .append(groupNames)
+                .append(subscriptionPending)
+                .append(itemType)
+                .append(name)
+                .append(jid)
+                .append(approved)
+                .build();
         }
 
         @Override
         public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            Item other = (Item) obj;
-            if (groupNames == null) {
-                if (other.groupNames != null)
-                    return false;
-            }
-            else if (!groupNames.equals(other.groupNames))
-                return false;
-            if (subscriptionPending != other.subscriptionPending)
-                return false;
-            if (itemType != other.itemType)
-                return false;
-            if (name == null) {
-                if (other.name != null)
-                    return false;
-            }
-            else if (!name.equals(other.name))
-                return false;
-            if (jid == null) {
-                if (other.jid != null)
-                    return false;
-            }
-            else if (!jid.equals(other.jid))
-                return false;
-            if (approved != other.approved)
-                return false;
-            return true;
+            return EqualsUtil.equals(this, obj, (e, o) ->
+                e.append(groupNames, o.groupNames)
+                 .append(subscriptionPending, o.subscriptionPending)
+                 .append(itemType, o.itemType)
+                 .append(name, o.name)
+                 .append(jid, o.jid)
+                 .append(approved, o.approved)
+            );
         }
 
     }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterPacketProvider.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterPacketProvider.java
index 5513015af..47a08f1fb 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterPacketProvider.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterPacketProvider.java
@@ -23,11 +23,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.roster.packet.RosterPacket;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class RosterPacketProvider extends IQProvider<RosterPacket> {
 
@@ -40,9 +40,9 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
         roster.setVersion(version);
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String startTag = parser.getName();
                 switch (startTag) {
                 case "item":
@@ -51,7 +51,7 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 String endTag = parser.getName();
                 switch (endTag) {
                 case IQ.QUERY_ELEMENT:
@@ -59,6 +59,10 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
                         break outerloop;
                     }
                 }
+                break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         return roster;
@@ -85,9 +89,9 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
         item.setApproved(approved);
 
         outerloop: while (true) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             switch (eventType) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 String name = parser.getName();
                 switch (name) {
                 case RosterPacket.Item.GROUP:
@@ -98,11 +102,14 @@ public class RosterPacketProvider extends IQProvider<RosterPacket> {
                     break;
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 if (parser.getDepth() == initialDepth) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         ParserUtils.assertAtEndTag(parser);
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterVerStreamFeatureProvider.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterVerStreamFeatureProvider.java
index 0c0d1fefd..0f71fafea 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterVerStreamFeatureProvider.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/RosterVerStreamFeatureProvider.java
@@ -20,7 +20,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.roster.packet.RosterVer;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public class RosterVerStreamFeatureProvider extends ExtensionElementProvider<RosterVer> {
 
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/SubscriptionPreApprovalStreamFeatureProvider.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/SubscriptionPreApprovalStreamFeatureProvider.java
index 4016a5040..422ced505 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/SubscriptionPreApprovalStreamFeatureProvider.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/provider/SubscriptionPreApprovalStreamFeatureProvider.java
@@ -20,7 +20,7 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.roster.packet.SubscriptionPreApproval;
 
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public class SubscriptionPreApprovalStreamFeatureProvider extends ExtensionElementProvider<SubscriptionPreApproval> {
 
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
index 473777569..3dd4fde6a 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java
@@ -34,10 +34,10 @@ import org.jivesoftware.smack.roster.provider.RosterPacketProvider;
 import org.jivesoftware.smack.util.FileUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.util.stringencoder.Base32;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Stores roster entries as specified by RFC 6121 for roster versioning
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
index 85d0457d6..1af4f574c 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
@@ -45,6 +45,7 @@ import org.jivesoftware.smack.roster.packet.RosterPacket.ItemType;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.test.util.WaitForPacketListener;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.junit.After;
 import org.junit.Before;
@@ -53,7 +54,6 @@ import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Tests that verifies the correct behavior of the {@link Roster} implementation.
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStoreTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStoreTest.java
index e86eb75bc..bf116b874 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStoreTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStoreTest.java
@@ -118,7 +118,7 @@ public class DirectoryRosterStoreTest {
         item2.setSubscriptionPending(true);
         item2.setItemType(ItemType.none);
         item2.setApproved(true);
-        store.addEntry(item2,version2);
+        store.addEntry(item2, version2);
         assertEquals("Updating entry sets version correctly", version2, store.getRosterVersion());
         storedItem = store.getEntry(userName);
         assertNotNull("Added entry not found", storedItem);
diff --git a/smack-integration-test/build.gradle b/smack-integration-test/build.gradle
index ab813a5d4..aa6ade5ed 100644
--- a/smack-integration-test/build.gradle
+++ b/smack-integration-test/build.gradle
@@ -22,6 +22,7 @@ dependencies {
 	// junit:junit:4.12, which we currently need in sinttest, since it
 	// (ab)uses @Before from org.junit
 	compile "org.junit.vintage:junit-vintage-engine:$junitVersion"
+	compile 'junit:junit:4.12'
 	testCompile "org.jxmpp:jxmpp-jid:$jxmppVersion:tests"
 }
 
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
index 5ff2b1e82..962da4bee 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
@@ -174,7 +174,7 @@ public class SmackIntegrationTestFramework<DC extends AbstractXMPPConnection> {
         // TODO print effective configuration
 
         String[] testPackages;
-        if (config.testPackages == null) {
+        if (config.testPackages == null || config.testPackages.isEmpty()) {
             testPackages = new String[] { "org.jivesoftware.smackx", "org.jivesoftware.smack" };
         }
         else {
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/XmppConnectionDescriptor.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/XmppConnectionDescriptor.java
index 5ff5fb369..29a24aecc 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/XmppConnectionDescriptor.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/XmppConnectionDescriptor.java
@@ -71,7 +71,12 @@ public class XmppConnectionDescriptor<C extends AbstractXMPPConnection, CC exten
         sinttestConfiguration.configurationApplier.applyConfigurationTo(connectionConfigurationBuilder);
         ConnectionConfiguration connectionConfiguration = connectionConfigurationBuilder.build();
         CC concreteConnectionConfiguration = connectionConfigurationClass.cast(connectionConfiguration);
-        return connectionConstructor.newInstance(concreteConnectionConfiguration);
+
+        C connection = connectionConstructor.newInstance(concreteConnectionConfiguration);
+
+        connection.setReplyTimeout(sinttestConfiguration.replyTimeout);
+
+        return connection;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java
index b4d581647..651137694 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferIntegrationTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import org.jivesoftware.smack.SmackException;
@@ -48,12 +48,7 @@ public class FileTransferIntegrationTest extends AbstractSmackIntegrationTest {
     private static final byte[] dataToSend;
 
     static {
-        try {
-            dataToSend = StringUtils.insecureRandomString(1024 * 4 * 5).getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        dataToSend = StringUtils.insecureRandomString(1024 * 4 * 5).getBytes(StandardCharsets.UTF_8);
     }
 
     @SmackIntegrationTest
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoMessageListener.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoMessageListener.java
index 1ad4fa0bf..073c82e7e 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoMessageListener.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/AbstractOmemoMessageListener.java
@@ -41,9 +41,9 @@ public class AbstractOmemoMessageListener implements OmemoMessageListener {
     }
 
     private static class SyncPointListener extends AbstractOmemoMessageListener {
-        protected final ResultSyncPoint<?,?> syncPoint;
+        protected final ResultSyncPoint<?, ?> syncPoint;
 
-        SyncPointListener(ResultSyncPoint<?,?> syncPoint) {
+        SyncPointListener(ResultSyncPoint<?, ?> syncPoint) {
             this.syncPoint = syncPoint;
         }
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java
index c4cf718d3..83234924d 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/OmemoManagerSetupHelper.java
@@ -125,7 +125,7 @@ public class OmemoManagerSetupHelper {
     }
 
     public static void cleanUpPubSub(OmemoManager omemoManager) {
-        PubSubManager pm = PubSubManager.getInstanceFor(omemoManager.getConnection(),omemoManager.getOwnJid());
+        PubSubManager pm = PubSubManager.getInstanceFor(omemoManager.getConnection(), omemoManager.getOwnJid());
         try {
             omemoManager.requestDeviceListUpdateFor(omemoManager.getOwnJid());
         } catch (SmackException.NotConnectedException | InterruptedException | SmackException.NoResponseException | PubSubException.NotALeafNodeException | XMPPException.XMPPErrorException e) {
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java
index 40d31c161..61eb04129 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/FormTest.java
@@ -25,7 +25,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.filter.ThreadFilter;
 import org.jivesoftware.smack.packet.Message;
-
+import org.jivesoftware.smackx.xdata.FormField.Type;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
 
 import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
@@ -59,34 +59,35 @@ public class FormTest extends AbstractSmackIntegrationTest {
             "Fill out this form to report your case.\nThe case will be created automatically.");
         formToSend.setTitle("Case configurations");
         // Add a hidden variable
-        FormField field = new FormField("hidden_var");
+        FormField.Builder field = FormField.builder("hidden_var");
         field.setType(FormField.Type.hidden);
         field.addValue("Some value for the hidden variable");
-        formToSend.addField(field);
+        formToSend.addField(field.build());
         // Add a fixed variable
-        field = new FormField();
+        field = FormField.builder();
         field.addValue("Section 1: Case description");
-        formToSend.addField(field);
+        field.setType(Type.fixed);
+        formToSend.addField(field.build());
         // Add a text-single variable
-        field = new FormField("name");
+        field = FormField.builder("name");
         field.setLabel("Enter a name for the case");
         field.setType(FormField.Type.text_single);
-        formToSend.addField(field);
+        formToSend.addField(field.build());
         // Add a text-multi variable
-        field = new FormField("description");
+        field = FormField.builder("description");
         field.setLabel("Enter a description");
         field.setType(FormField.Type.text_multi);
-        formToSend.addField(field);
+        formToSend.addField(field.build());
         // Add a boolean variable
-        field = new FormField("time");
+        field = FormField.builder("time");
         field.setLabel("Is this your first case?");
         field.setType(FormField.Type.bool);
-        formToSend.addField(field);
+        formToSend.addField(field.build());
         // Add a text variable where an int value is expected
-        field = new FormField("age");
+        field = FormField.builder("age");
         field.setLabel("How old are you?");
         field.setType(FormField.Type.text_single);
-        formToSend.addField(field);
+        formToSend.addField(field.build());
 
         // Create the chats between the two participants
         org.jivesoftware.smack.chat.Chat chat = org.jivesoftware.smack.chat.ChatManager.getInstanceFor(conOne).createChat(conTwo.getUser(), null);
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java b/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
index 6606bce04..f817fd058 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java
@@ -108,7 +108,7 @@ public class XmppHostnameVerifier implements HostnameVerifier {
 
     private static boolean match(String name, KerberosPrincipal peerPrincipal) {
         // TODO
-        LOGGER.warning("KerberosPrincipal validation not implemented yet. Can not verify " + name);
+        LOGGER.warning("KerberosPrincipal '" + peerPrincipal + "' validation not implemented yet. Can not verify " + name);
         return false;
     }
 
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
index 1d2d9a530..18869e3b9 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java
@@ -16,10 +16,9 @@
  */
 package org.jivesoftware.smack.util.stringencoder.java7;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.stringencoder.StringEncoder;
 
 
@@ -52,25 +51,14 @@ public final class Java7Base64UrlSafeEncoder implements StringEncoder<String> {
 
     @Override
     public String encode(String s) {
-        byte[] bytes;
-        try {
-            bytes = s.getBytes(StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
         return encoder.encodeToString(bytes);
     }
 
     @Override
     public String decode(String s) {
         byte[] bytes = decoder.decode(s);
-        try {
-            return new String(bytes, StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        return new String(bytes, StandardCharsets.UTF_8);
     }
 
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
index 99fbc1462..5942209bc 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
@@ -28,7 +28,7 @@ import org.jivesoftware.smackx.jingleold.packet.Jingle;
  *  @author Jeff Williams
  *  @see JingleSessionState
  */
-
+@SuppressWarnings("UnusedVariable")
 public class JingleSessionStatePending extends JingleSessionState {
     private static final Logger LOGGER = Logger.getLogger(JingleSessionStatePending.class.getName());
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
index 666f61ac7..24455c4b9 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
@@ -40,6 +40,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleTransport;
  *  @author Jeff Williams
  *  @see JingleSessionState
  */
+@SuppressWarnings("UnusedVariable")
 public class JingleSessionStateUnknown extends JingleSessionState {
     private static final Logger LOGGER = Logger.getLogger(JingleSessionStateUnknown.class.getName());
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
index e5516d1b0..c354a9fae 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
@@ -45,6 +45,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleError;
  *
  * @author Thiago Camargo
  */
+@SuppressWarnings("UnusedVariable")
 public class MediaNegotiator extends JingleNegotiator {
 
     private static final Logger LOGGER = Logger.getLogger(MediaNegotiator.class.getName());
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java
index c8a03da1c..64199a974 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java
@@ -17,8 +17,6 @@
 package org.jivesoftware.smackx.jingleold.mediaimpl;
 
 import java.awt.Frame;
-import java.awt.TextArea;
-import java.awt.Toolkit;
 import java.util.Vector;
 import java.util.logging.Logger;
 
@@ -30,6 +28,7 @@ import javax.media.format.AudioFormat;
 import com.sun.media.ExclusiveUse;
 import com.sun.media.util.Registry;
 
+@SuppressWarnings("UnusedVariable")
 public class JMFInit extends Frame implements Runnable {
 
     private static final long serialVersionUID = 6476412003260641680L;
@@ -278,24 +277,6 @@ public class JMFInit extends Frame implements Runnable {
         LOGGER.fine(mesg);
     }
 
-    private void createGUI() {
-        TextArea textBox = new TextArea(5, 50);
-        add("Center", textBox);
-        textBox.setEditable(false);
-        addNotify();
-        pack();
-
-        int scrWidth = (int) Toolkit.getDefaultToolkit().getScreenSize()
-                .getWidth();
-        int scrHeight = (int) Toolkit.getDefaultToolkit().getScreenSize()
-                .getHeight();
-
-        setLocation((scrWidth - getWidth()) / 2, (scrHeight - getHeight()) / 2);
-
-        setVisible(visible);
-
-    }
-
     public static void start(boolean visible) {
         new JMFInit(null, visible);
     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
index 295728b57..3e0aace1a 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
@@ -54,7 +54,7 @@ public class AudioMediaSession extends JingleMediaSession {
      */
     public AudioMediaSession(final PayloadType payloadType, final TransportCandidate remote,
             final TransportCandidate local, String locator, JingleSession jingleSession) {
-        super(payloadType, remote, local, locator == null ? "dsound://" : locator,jingleSession);
+        super(payloadType, remote, local, locator == null ? "dsound://" : locator, jingleSession);
         initialize();
     }
 
@@ -85,7 +85,7 @@ public class AudioMediaSession extends JingleMediaSession {
             remotePort = this.getRemote().getPort();
         }
 
-        audioChannel = new AudioChannel(new MediaLocator(this.getMediaLocator()), localIp, ip, localPort, remotePort, AudioFormatUtils.getAudioFormat(this.getPayloadType()),this);
+        audioChannel = new AudioChannel(new MediaLocator(this.getMediaLocator()), localIp, ip, localPort, remotePort, AudioFormatUtils.getAudioFormat(this.getPayloadType()), this);
     }
 
     /**
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java
index ff4df0161..d77d9206c 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java
@@ -62,7 +62,7 @@ public class SpeexMediaManager extends JingleMediaManager {
      */
     @Override
     public JingleMediaSession createMediaSession(PayloadType payloadType, final TransportCandidate remote, final TransportCandidate local, final JingleSession jingleSession) {
-        return new AudioMediaSession(payloadType, remote, local, null,null);
+        return new AudioMediaSession(payloadType, remote, local, null, null);
     }
 
     /**
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java
index 80fb7be0f..9139740f3 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java
@@ -34,7 +34,7 @@ import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
  *
  * @author Thiago Camargo
  */
-
+@SuppressWarnings("UnusedVariable")
 public class ScreenShareMediaManager extends JingleMediaManager {
 
     public static final String MEDIA_NAME = "ScreenShare";
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java
index 68469ef28..f5234764e 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java
@@ -36,6 +36,7 @@ import java.util.logging.Logger;
  *
  * @author Thiago Rocha Camargo
  */
+@SuppressWarnings("UnusedVariable")
 public class ImageTransmitter implements Runnable {
 
     private static final Logger LOGGER = Logger.getLogger(ImageTransmitter.class.getName());
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java
index 3af428e38..bb6e7ff27 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java
@@ -27,6 +27,7 @@ import java.util.logging.Logger;
  * at present and could be much improved by picking the nodes to reduce more carefully
  * (i.e. not completely at random) when I get the time.
  */
+@SuppressWarnings("UnusedVariable")
 public class OctTreeQuantizer implements Quantizer {
 
     private static final Logger LOGGER = Logger.getLogger(OctTreeQuantizer.class.getName());
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java
index 2a435062d..b401757a5 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java
@@ -25,6 +25,7 @@ import java.awt.image.WritableRaster;
  * A filter which acts as a superclass for filters which need to have the whole image in memory
  * to do their stuff.
  */
+@SuppressWarnings("UnusedVariable")
 public abstract class WholeImageFilter extends AbstractBufferedImageOp {
 
     /**
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java
index ca1fb5770..eaeb70ee2 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java
@@ -32,6 +32,7 @@ import org.jivesoftware.smackx.jingleold.media.PayloadType;
  *
  * @author Thiago Camargo
  */
+@SuppressWarnings("UnusedVariable")
 public class BridgedTransportManager extends JingleTransportManager implements JingleSessionListener, CreatedJingleSessionListener {
 
     XMPPConnection xmppConnection;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java
index 705389e19..f011dc46c 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java
@@ -23,15 +23,15 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.util.StringUtils;
-
 /**
  * A very Simple HTTP Server.
  */
+@SuppressWarnings("UnusedVariable")
 public class HttpServer {
 
     private static final Logger LOGGER = Logger.getLogger(HttpServer.class.getName());
@@ -87,7 +87,7 @@ public class HttpServer {
             this.socket = socket;
             this.input = socket.getInputStream();
             this.output = socket.getOutputStream();
-            this.br = new BufferedReader(new InputStreamReader(socket.getInputStream(), StringUtils.UTF8));
+            this.br = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
         }
 
         @Override
@@ -121,16 +121,16 @@ public class HttpServer {
                             + entityBody.length() + CRLF;
                     contentTypeLine = "text/html";
 
-                    output.write(statusLine.getBytes(StringUtils.UTF8));
+                    output.write(statusLine.getBytes(StandardCharsets.UTF_8));
 
-                    output.write(serverLine.getBytes(StringUtils.UTF8));
+                    output.write(serverLine.getBytes(StandardCharsets.UTF_8));
 
-                    output.write(contentTypeLine.getBytes(StringUtils.UTF8));
-                    output.write(contentLengthLine.getBytes(StringUtils.UTF8));
+                    output.write(contentTypeLine.getBytes(StandardCharsets.UTF_8));
+                    output.write(contentLengthLine.getBytes(StandardCharsets.UTF_8));
 
-                    output.write(CRLF.getBytes(StringUtils.UTF8));
+                    output.write(CRLF.getBytes(StandardCharsets.UTF_8));
 
-                    output.write(entityBody.getBytes(StringUtils.UTF8));
+                    output.write(entityBody.getBytes(StandardCharsets.UTF_8));
 
                 }
             }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java
index 0e329ea05..0ac5c10bb 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java
@@ -219,6 +219,7 @@ public final class ICECandidate extends TransportCandidate implements Comparable
      *
      * ICE Candidate can check connectivity using UDP echo Test.
      */
+    @SuppressWarnings("UnusedVariable")
     @Override
     public void check(final List<TransportCandidate> localCandidates) {
         // TODO candidate is being checked trigger
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java
index 99ce1b145..c29148fb2 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java
@@ -30,6 +30,7 @@ import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
 import org.jivesoftware.smackx.jingleold.media.PayloadType;
 import org.jivesoftware.smackx.jingleold.nat.ICECandidate.Type;
 
+@SuppressWarnings("UnusedVariable")
 public class ICETransportManager extends JingleTransportManager implements JingleSessionListener, CreatedJingleSessionListener {
     private static final Logger LOGGER = Logger.getLogger(ICETransportManager.class.getName());
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
index 2840131fa..b4160d833 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
@@ -34,13 +34,12 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * RTPBridge IQ Stanza used to request and retrieve a RTPBridge Candidates that can be used for a Jingle Media Transmission between two parties that are behind NAT.
  * This Jingle Bridge has all the needed information to establish a full UDP Channel (Send and Receive) between two parties.
@@ -335,7 +334,7 @@ public class RTPBridge extends IQ {
 
             boolean done = false;
 
-            int eventType;
+            XmlPullParser.Event eventType;
             String elementName;
 
             if (!parser.getNamespace().equals(RTPBridge.NAMESPACE))
@@ -354,7 +353,7 @@ public class RTPBridge extends IQ {
                 eventType = parser.next();
                 elementName = parser.getName();
 
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (elementName.equals("candidate")) {
                         for (int i = 0; i < parser.getAttributeCount(); i++) {
                             if (parser.getAttributeName(i).equals("ip"))
@@ -376,7 +375,7 @@ public class RTPBridge extends IQ {
                         }
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(RTPBridge.ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
index ac3c2aa4c..72bfd7ed2 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
@@ -30,14 +30,13 @@ import org.jivesoftware.smack.packet.SimpleIQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.disco.packet.DiscoverItems;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * STUN IQ Stanza used to request and retrieve a STUN server and port to make p2p connections easier. STUN is usually used by Jingle Media Transmission between two parties that are behind NAT.
  *
@@ -123,7 +122,7 @@ public class STUN extends SimpleIQ {
 
             boolean done = false;
 
-            int eventType;
+            XmlPullParser.Event eventType;
             String elementName;
 
             if (!parser.getNamespace().equals(NAMESPACE))
@@ -136,7 +135,7 @@ public class STUN extends SimpleIQ {
                 eventType = parser.next();
                 elementName = parser.getName();
 
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (elementName.equals("server")) {
                         String host = null;
                         String port = null;
@@ -159,7 +158,7 @@ public class STUN extends SimpleIQ {
                             iq.setPublicIp(host);
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java
index e1acffaab..0ab8fa71b 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java
@@ -28,15 +28,15 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingleold.JingleSession;
 
 import de.javawi.jstun.test.BindingLifetimeTest;
 import de.javawi.jstun.test.DiscoveryInfo;
 import de.javawi.jstun.test.DiscoveryTest;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
 
 /**
  * Transport resolver using the JSTUN library, to discover public IP and use it as a candidate.
@@ -141,13 +141,11 @@ public class STUNResolver extends TransportResolver {
         int serverPort;
 
         try {
-            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-            parser.setInput(stunConfigStream, "UTF-8");
+            XmlPullParser parser = PacketParserUtils.getParserFor(stunConfigStream);
 
-            int eventType = parser.getEventType();
+            XmlPullParser.Event eventType = parser.getEventType();
             do {
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                     // Parse a STUN server definition
                     if (parser.getName().equals("stunServer")) {
@@ -181,7 +179,7 @@ public class STUNResolver extends TransportResolver {
                 eventType = parser.next();
 
             }
-            while (eventType != XmlPullParser.END_DOCUMENT);
+            while (eventType != XmlPullParser.Event.END_DOCUMENT);
 
         }
         catch (XmlPullParserException e) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java
index 34e2ae3cf..8e3936719 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java
@@ -31,6 +31,7 @@ import java.util.logging.Logger;
  * It Creates a TCP Socket That Connects to another TCP Socket Listener and forwards every packets received to an UDP Listener.
  * And forwards every packets received in UDP Socket, to the TCP Server
  */
+@SuppressWarnings("UnusedVariable")
 public class TcpUdpBridgeClient {
 
     private static final Logger LOGGER = Logger.getLogger(TcpUdpBridgeClient.class.getName());
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java
index 60fa3f073..2ff8744b5 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java
@@ -33,6 +33,7 @@ import java.util.logging.Logger;
  * It Creates a TCP Socket Listeners for Connections and forwards every packets received to an UDP Listener.
  * And forwards every packets received in UDP Socket, to the TCP Client
  */
+@SuppressWarnings("UnusedVariable")
 public class TcpUdpBridgeServer {
 
     private static final Logger LOGGER = Logger.getLogger(TcpUdpBridgeServer.class.getName());
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
index 233bdec59..cc873017f 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java
@@ -31,6 +31,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.XMPPConnection;
+
 import org.jivesoftware.smackx.jingleold.JingleSession;
 
 import org.jxmpp.jid.Jid;
@@ -349,6 +350,7 @@ public abstract class TransportCandidate {
      *
      * Subclasses should provide better methods if they can...
      */
+    @SuppressWarnings("UnusedVariable")
     public void check(final List<TransportCandidate> localCandidates) {
         // TODO candidate is being checked trigger
         // candidatesChecking.add(cand);
@@ -668,6 +670,7 @@ public abstract class TransportCandidate {
 
         }
 
+        @SuppressWarnings("UnusedVariable")
         @Override
         public void run() {
             try {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
index 2df06e3c1..e8709c3bc 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
@@ -51,6 +51,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportC
  *
  * @author Alvaro Saurin
  */
+@SuppressWarnings("UnusedVariable")
 public abstract class TransportNegotiator extends JingleNegotiator {
 
     private static final Logger LOGGER = Logger.getLogger(TransportNegotiator.class.getName());
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java
index d905d7f9b..e261588d9 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java
@@ -22,11 +22,10 @@ import java.util.Locale;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.jingleold.media.ContentInfo;
 
-import org.xmlpull.v1.XmlPullParser;
-
 public class JingleError implements ExtensionElement {
 
     public static String NAMESPACE = "urn:xmpp:tmp:jingle:errors";
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java
index 473b402e1..de8553a32 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java
@@ -20,14 +20,13 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingleold.media.PayloadType;
 import org.jivesoftware.smackx.jingleold.packet.JingleContentDescription;
 import org.jivesoftware.smackx.jingleold.packet.JingleContentDescription.JinglePayloadType;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parser for a Jingle description.
  *
@@ -77,17 +76,17 @@ public abstract class JingleContentDescriptionProvider extends ExtensionElementP
         JingleContentDescription desc = getInstance();
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             String name = parser.getName();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (name.equals(JingleContentDescription.JinglePayloadType.NODENAME)) {
                     desc.addJinglePayloadType(parsePayload(parser));
                 } else {
                     // TODO: Should be SmackParseException.
                     throw new IOException("Unknow element \"" + name + "\" in content.");
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (name.equals(JingleContentDescription.NODENAME)) {
                     done = true;
                 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java
index 53e13a878..ba32a28b3 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java
@@ -19,12 +19,11 @@ package org.jivesoftware.smackx.jingleold.provider;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.jingleold.media.ContentInfo;
 import org.jivesoftware.smackx.jingleold.packet.JingleContentInfo;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Jingle Audio jmf-info provider.
  *
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java
index d8871ac4c..f60b35dbc 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java
@@ -18,11 +18,10 @@ package org.jivesoftware.smackx.jingleold.provider;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.jingleold.packet.JingleContent;
 
-import org.xmlpull.v1.XmlPullParser;
-
 /**
  * Jingle &lt;content&gt; provider.
  *
@@ -35,7 +34,6 @@ public class JingleContentProvider extends ExtensionElementProvider<JingleConten
      */
     @Override
     public JingleContent parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) {
-        String elementName = parser.getName();
         String creator = parser.getAttributeValue("", JingleContent.CREATOR);
         String name = parser.getAttributeValue("", JingleContent.NAME);
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java
index 045980326..70aea87f2 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java
@@ -20,13 +20,12 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingleold.media.PayloadType;
 import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Parser for a Jingle description.
  *
@@ -76,17 +75,17 @@ public abstract class JingleDescriptionProvider extends ExtensionElementProvider
         JingleDescription desc = getInstance();
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             String name = parser.getName();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (name.equals(PayloadType.NODENAME)) {
                     desc.addPayloadType(parsePayload(parser));
                 } else {
                     // TODO: Should be SmackParseException.
                     throw new IOException("Unknow element \"" + name + "\" in content.");
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (name.equals(JingleDescription.NODENAME)) {
                     done = true;
                 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
index ece82adc8..499dde5b6 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java
@@ -24,6 +24,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingleold.JingleActionEnum;
 import org.jivesoftware.smackx.jingleold.packet.Jingle;
@@ -33,8 +35,6 @@ import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
 import org.jivesoftware.smackx.jingleold.packet.JingleTransport;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * The JingleProvider parses Jingle packets.
@@ -53,7 +53,7 @@ public class JingleProvider extends IQProvider<Jingle> {
     public Jingle parse(XmlPullParser parser, int intialDepth, XmlEnvironment xmlEnvironment) throws IOException, XmlPullParserException, SmackParsingException {
 
         Jingle jingle = new Jingle();
-        String sid = "";
+        String sid;
         JingleActionEnum action;
         Jid initiator, responder;
         boolean done = false;
@@ -66,7 +66,7 @@ public class JingleProvider extends IQProvider<Jingle> {
         JingleTransportProvider jtpIce = new JingleTransportProvider.Ice();
         ExtensionElementProvider<?> jmipAudio = new JingleContentInfoProvider.Audio();
 
-        int eventType;
+        XmlPullParser.Event eventType;
         String elementName;
         String namespace;
 
@@ -87,7 +87,7 @@ public class JingleProvider extends IQProvider<Jingle> {
             elementName = parser.getName();
             namespace = parser.getNamespace();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
 
                 // Parse some well know subelements, depending on the namespaces
                 // and element names...
@@ -119,7 +119,7 @@ public class JingleProvider extends IQProvider<Jingle> {
                             + elementName + "\" in Jingle packet.");
                 }
 
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals(Jingle.getElementName())) {
                     done = true;
                 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
index da7c67779..ee3d78e48 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
@@ -20,15 +20,14 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.jingleold.nat.ICECandidate;
 import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 import org.jivesoftware.smackx.jingleold.packet.JingleTransport;
 import org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportCandidate;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Provider for a Jingle transport element.
  *
@@ -59,10 +58,10 @@ public abstract class JingleTransportProvider extends ExtensionElementProvider<J
         JingleTransport trans = getInstance();
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
             String name = parser.getName();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (name.equals(JingleTransportCandidate.NODENAME)) {
                     JingleTransportCandidate jtc = parseCandidate(parser);
                     if (jtc != null) trans.addCandidate(jtc);
@@ -72,7 +71,7 @@ public abstract class JingleTransportProvider extends ExtensionElementProvider<J
                     throw new IOException("Unknown tag \"" + name + "\" in transport element.");
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (name.equals(JingleTransport.NODENAME)) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
index 650d5e82f..1e878ae14 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
@@ -25,10 +25,10 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.SimpleIQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 
 public class OfferConfirmation extends SimpleIQ {
@@ -72,21 +72,21 @@ public class OfferConfirmation extends SimpleIQ {
             while (!done) {
                 parser.next();
                 String elementName = parser.getName();
-                if (parser.getEventType() == XmlPullParser.START_TAG && "user-jid".equals(elementName)) {
+                if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "user-jid".equals(elementName)) {
                     try {
                         confirmation.setUserJID(parser.nextText());
                     }
                     catch (NumberFormatException nfe) {
                     }
                 }
-                else if (parser.getEventType() == XmlPullParser.START_TAG && "session-id".equals(elementName)) {
+                else if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "session-id".equals(elementName)) {
                     try {
                         confirmation.setSessionID(Long.valueOf(parser.nextText()));
                     }
                     catch (NumberFormatException nfe) {
                     }
                 }
-                else if (parser.getEventType() == XmlPullParser.END_TAG && "offer-confirmation".equals(elementName)) {
+                else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && "offer-confirmation".equals(elementName)) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
index 335d3e82c..e27c472bd 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
@@ -24,9 +24,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class WorkgroupForm extends SimpleIQ {
 
@@ -57,12 +56,12 @@ public class WorkgroupForm extends SimpleIQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     // Parse the packet extension
                     PacketParserUtils.addExtensionElement(answer, parser, xmlEnvironment);
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
index 12db396a8..678402fb3 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
@@ -26,10 +26,10 @@ import java.util.List;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityBareJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * IQ provider used to retrieve individual agent information. Each chat session can be mapped
@@ -95,7 +95,7 @@ public class AgentChatHistory extends IQ {
 
         @Override
         public AgentChatHistory parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
-            if (parser.getEventType() != XmlPullParser.START_TAG) {
+            if (parser.getEventType() != XmlPullParser.Event.START_ELEMENT) {
                 throw new IllegalStateException("Parser not in proper position, or bad XML.");
             }
 
@@ -103,12 +103,12 @@ public class AgentChatHistory extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "chat-session".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "chat-session".equals(parser.getName())) {
                     agentChatHistory.addChatSession(parseChatSetting(parser));
 
                 }
-                else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(parser.getName())) {
                     done = true;
                 }
             }
@@ -126,28 +126,28 @@ public class AgentChatHistory extends IQ {
             String question = null;
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "date".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "date".equals(parser.getName())) {
                     String dateStr = parser.nextText();
                     long l = Long.valueOf(dateStr).longValue();
                     date = new Date(l);
                 }
-                else if (eventType == XmlPullParser.START_TAG && "duration".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "duration".equals(parser.getName())) {
                     duration = Long.valueOf(parser.nextText()).longValue();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "visitorsName".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "visitorsName".equals(parser.getName())) {
                     visitorsName = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "visitorsEmail".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "visitorsEmail".equals(parser.getName())) {
                     visitorsEmail = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "sessionID".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "sessionID".equals(parser.getName())) {
                     sessionID = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "question".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "question".equals(parser.getName())) {
                     question = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.END_TAG && "chat-session".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "chat-session".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
index 0a83f0800..4f880ef57 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
@@ -25,12 +25,11 @@ import java.util.Map;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class ChatMetadata extends IQ {
 
     /**
@@ -91,8 +90,8 @@ public class ChatMetadata extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("sessionID")) {
                        chatM.setSessionID(parser.nextText());
                     }
@@ -101,7 +100,7 @@ public class ChatMetadata extends IQ {
                         chatM.setMetadata(map);
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
index 601ebe739..ef4877a8d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java
@@ -113,31 +113,28 @@ public class MacroGroup {
     }
 
     public String toXML() {
-        // CHECKSTYLE:OFF
-    	StringBuilder buf = new StringBuilder();
-    	buf.append("<macrogroup>");
-    	buf.append("<title>" +  getTitle() + "</title>");
-    	buf.append("<macros>");
-    	for (Macro macro : getMacros())
-		{
-    		buf.append("<macro>");
-    		buf.append("<title>" + macro.getTitle() + "</title>");
-    		buf.append("<type>" + macro.getType() + "</type>");
-    		buf.append("<description>" + macro.getDescription() + "</description>");
-    		buf.append("<response>" + macro.getResponse() + "</response>");
-    		buf.append("</macro>");
-		}
-    	buf.append("</macros>");
+        StringBuilder buf = new StringBuilder();
+        buf.append("<macrogroup>");
+        buf.append("<title>" +  getTitle() + "</title>");
+        buf.append("<macros>");
+        for (Macro macro : getMacros()) {
+            buf.append("<macro>");
+            buf.append("<title>" + macro.getTitle() + "</title>");
+            buf.append("<type>" + macro.getType() + "</type>");
+            buf.append("<description>" + macro.getDescription() + "</description>");
+            buf.append("<response>" + macro.getResponse() + "</response>");
+            buf.append("</macro>");
+        }
+        buf.append("</macros>");
 
-    	if (getMacroGroups().size() > 0) {
-    		buf.append("<macroGroups>");
-    		for (MacroGroup groups : getMacroGroups()) {
-    			buf.append(groups.toXML());
-    		}
-    		buf.append("</macroGroups>");
-    	}
-    	buf.append("</macrogroup>");
-    	return buf.toString();
-        // CHECKSTYLE:ON
+        if (getMacroGroups().size() > 0) {
+            buf.append("<macroGroups>");
+            for (MacroGroup groups : getMacroGroups()) {
+                buf.append(groups.toXML());
+            }
+            buf.append("</macroGroups>");
+        }
+        buf.append("</macrogroup>");
+        return buf.toString();
     }
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
index b6117454c..203ead960 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
@@ -18,16 +18,14 @@
 package org.jivesoftware.smackx.workgroup.ext.macros;
 
 import java.io.IOException;
-import java.io.StringReader;
 
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
+import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.util.StringUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * Macros iq is responsible for handling global and personal macros in the a Live Assistant
@@ -85,11 +83,9 @@ public class Macros extends IQ {
             buf.append("<personal>true</personal>");
         }
         if (getPersonalMacroGroup() != null) {
-            // CHECKSTYLE:OFF
-        	buf.append("<personalMacro>");
-        	buf.append(StringUtils.escapeForXmlText(getPersonalMacroGroup().toXML()));
-        	buf.append("</personalMacro>");
-            // CHECKSTYLE:ON
+            buf.append("<personalMacro>");
+            buf.append(StringUtils.escapeForXmlText(getPersonalMacroGroup().toXML()));
+            buf.append("</personalMacro>");
         }
 
         return buf;
@@ -108,15 +104,15 @@ public class Macros extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("model")) {
                         String macros = parser.nextText();
                         MacroGroup group = parseMacroGroups(macros);
                         macroGroup.setRootGroup(group);
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
@@ -130,8 +126,8 @@ public class Macros extends IQ {
             Macro macro = new Macro();
              boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("title")) {
                         parser.next();
                         macro.setTitle(parser.getText());
@@ -146,7 +142,7 @@ public class Macros extends IQ {
                         macro.setType(Integer.valueOf(parser.nextText()).intValue());
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("macro")) {
                         done = true;
                     }
@@ -160,8 +156,8 @@ public class Macros extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("macrogroup")) {
                         group.addMacroGroup(parseMacroGroup(parser));
                     }
@@ -172,7 +168,7 @@ public class Macros extends IQ {
                         group.addMacro(parseMacro(parser));
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("macrogroup")) {
                         done = true;
                     }
@@ -183,12 +179,12 @@ public class Macros extends IQ {
 
         public MacroGroup parseMacroGroups(String macros) throws XmlPullParserException, IOException {
             MacroGroup group = null;
-            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-            parser.setInput(new StringReader(macros));
-            int eventType = parser.getEventType();
-            while (eventType != XmlPullParser.END_DOCUMENT) {
+            XmlPullParser parser = PacketParserUtils.getParserFor(macros);
+
+            XmlPullParser.Event eventType = parser.getEventType();
+            while (eventType != XmlPullParser.Event.END_DOCUMENT) {
                 eventType = parser.next();
-                 if (eventType == XmlPullParser.START_TAG) {
+                 if (eventType == XmlPullParser.Event.START_ELEMENT) {
                         if (parser.getName().equals("macrogroup")) {
                             group = parseMacroGroup(parser);
                         }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
index a61a0e9bf..89d32692a 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
@@ -22,9 +22,8 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * IQ stanza for retrieving and adding Chat Notes.
@@ -90,8 +89,8 @@ public class ChatNotes extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("sessionID")) {
                         chatNotes.setSessionID(parser.nextText());
                     }
@@ -101,7 +100,7 @@ public class ChatNotes extends IQ {
                         chatNotes.setNotes(note);
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
index 3cd930687..5178c4d84 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
@@ -22,9 +22,8 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * IQ stanza for retrieving and changing the Agent personal information.
@@ -113,8 +112,8 @@ public class AgentInfo extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("jid")) {
                         answer.setJid(parser.nextText());
                     }
@@ -122,7 +121,7 @@ public class AgentInfo extends IQ {
                         answer.setName(parser.nextText());
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
index 49f5fabcd..486b19b57 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
@@ -30,10 +30,10 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityBareJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Agent status packet.
@@ -245,9 +245,9 @@ public class AgentStatus implements ExtensionElement {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
+                XmlPullParser.Event eventType = parser.next();
 
-                if (eventType == XmlPullParser.START_TAG) {
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if ("chat".equals(parser.getName())) {
                         agentStatus.currentChats.add(parseChatInfo(parser));
                     }
@@ -255,7 +255,7 @@ public class AgentStatus implements ExtensionElement {
                         agentStatus.maxChats = Integer.parseInt(parser.nextText());
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG &&
+                else if (eventType == XmlPullParser.Event.END_ELEMENT &&
                     ELEMENT_NAME.equals(parser.getName())) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
index cae551812..b52e61e99 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
@@ -27,10 +27,10 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityBareJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Agent status request packet. This stanza is used by agents to request the list of
@@ -127,11 +127,11 @@ public class AgentStatusRequest extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "agent".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "agent".equals(parser.getName())) {
                     statusRequest.agents.add(parseAgent(parser));
                 }
-                else if (eventType == XmlPullParser.END_TAG &&
+                else if (eventType == XmlPullParser.Event.END_ELEMENT &&
                         "agent-status-request".equals(parser.getName())) {
                     done = true;
                 }
@@ -146,11 +146,11 @@ public class AgentStatusRequest extends IQ {
             String type = parser.getAttributeValue("", "type");
             String name = null;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "name".equals(parser.getName())) {
                     name = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.END_TAG &&
+                else if (eventType == XmlPullParser.Event.END_ELEMENT &&
                         "agent".equals(parser.getName())) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
index 40cc86233..74944b998 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
@@ -27,10 +27,10 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Represents a request for getting the jid of the workgroups where an agent can work or could
@@ -112,13 +112,13 @@ public class AgentWorkgroups extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     if (parser.getName().equals("workgroup")) {
                         workgroups.add(parser.getAttributeValue("", "jid"));
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals("workgroups")) {
                         done = true;
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
index 0ee8e2821..924c41a0d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
@@ -23,13 +23,12 @@ import java.util.Map;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.workgroup.MetaData;
 import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * This provider parses meta data if it's not contained already in a larger extension provider.
  *
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
index 639b3663e..4e0f253a9 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
@@ -21,9 +21,8 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class MonitorPacket extends IQ {
 
@@ -86,8 +85,8 @@ public class MonitorPacket extends IQ {
 
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "isMonitor".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "isMonitor".equals(parser.getName())) {
                     String value = parser.nextText();
                     if ("false".equalsIgnoreCase(value)) {
                         packet.setMonitor(false);
@@ -96,7 +95,7 @@ public class MonitorPacket extends IQ {
                         packet.setMonitor(true);
                     }
                 }
-                else if (eventType == XmlPullParser.END_TAG && "monitor".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "monitor".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
index 46516fc1a..bb10ed916 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
@@ -31,9 +31,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * Stanza used for requesting information about occupants of a room or for retrieving information
@@ -143,11 +142,11 @@ public class OccupantsInfo extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG &&
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT &&
                         "occupant".equals(parser.getName())) {
                     occupantsInfo.occupants.add(parseOccupantInfo(parser));
-                } else if (eventType == XmlPullParser.END_TAG &&
+                } else if (eventType == XmlPullParser.Event.END_ELEMENT &&
                         ELEMENT_NAME.equals(parser.getName())) {
                     done = true;
                 }
@@ -162,13 +161,13 @@ public class OccupantsInfo extends IQ {
             String nickname = null;
             Date joined = null;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "jid".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "jid".equals(parser.getName())) {
                     jid = parser.nextText();
-                } else if (eventType == XmlPullParser.START_TAG &&
+                } else if (eventType == XmlPullParser.Event.START_ELEMENT &&
                         "nickname".equals(parser.getName())) {
                     nickname = parser.nextText();
-                } else if (eventType == XmlPullParser.START_TAG &&
+                } else if (eventType == XmlPullParser.Event.START_ELEMENT &&
                         "joined".equals(parser.getName())) {
                         synchronized (UTC_FORMAT) {
                         try {
@@ -177,7 +176,7 @@ public class OccupantsInfo extends IQ {
                             throw new SmackParsingException.SmackTextParseException(e);
                         }
                         }
-                } else if (eventType == XmlPullParser.END_TAG &&
+                } else if (eventType == XmlPullParser.Event.END_ELEMENT &&
                         "occupant".equals(parser.getName())) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
index 3526c9521..7167dedae 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
@@ -28,6 +28,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.workgroup.MetaData;
 import org.jivesoftware.smackx.workgroup.agent.InvitationRequest;
@@ -37,8 +39,6 @@ import org.jivesoftware.smackx.workgroup.agent.UserRequest;
 import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * An IQProvider for agent offer requests.
@@ -53,14 +53,14 @@ public class OfferRequestProvider extends IQProvider<IQ> {
 
     @Override
     public OfferRequestPacket parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
-        int eventType = parser.getEventType();
+        XmlPullParser.Event eventType = parser.getEventType();
         String sessionID = null;
         int timeout = -1;
         OfferContent content = null;
         boolean done = false;
         Map<String, List<String>> metaData = new HashMap<>();
 
-        if (eventType != XmlPullParser.START_TAG) {
+        if (eventType != XmlPullParser.Event.START_ELEMENT) {
             // throw exception
         }
 
@@ -71,7 +71,7 @@ public class OfferRequestProvider extends IQProvider<IQ> {
         while (!done) {
             eventType = parser.next();
 
-            if (eventType == XmlPullParser.START_TAG) {
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 String elemName = parser.getName();
 
                 if ("timeout".equals(elemName)) {
@@ -101,7 +101,7 @@ public class OfferRequestProvider extends IQProvider<IQ> {
                     content = new TransferRequest(transfer.getInviter(), transfer.getRoom(), transfer.getReason());
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if ("offer".equals(parser.getName())) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
index 131c33159..8cc0ad482 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
@@ -23,10 +23,10 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * An IQProvider class which has savvy about the offer-revoke tag.<br>
@@ -46,20 +46,20 @@ public class OfferRevokeProvider extends IQProvider<IQ> {
         boolean done = false;
 
         while (!done) {
-            int eventType = parser.next();
+            XmlPullParser.Event eventType = parser.next();
 
-            if ((eventType == XmlPullParser.START_TAG) && parser.getName().equals("reason")) {
+            if ((eventType == XmlPullParser.Event.START_ELEMENT) && parser.getName().equals("reason")) {
                 reason = parser.nextText();
             }
-            else if ((eventType == XmlPullParser.START_TAG)
+            else if ((eventType == XmlPullParser.Event.START_ELEMENT)
                          && parser.getName().equals(SessionID.ELEMENT_NAME)) {
                 sessionID = parser.getAttributeValue("", "id");
             }
-            else if ((eventType == XmlPullParser.START_TAG)
+            else if ((eventType == XmlPullParser.Event.START_ELEMENT)
                          && parser.getName().equals(UserID.ELEMENT_NAME)) {
                 userID = ParserUtils.getJidAttribute(parser, "id");
             }
-            else if ((eventType == XmlPullParser.END_TAG) && parser.getName().equals(
+            else if ((eventType == XmlPullParser.Event.END_ELEMENT) && parser.getName().equals(
                     "offer-revoke")) {
                 done = true;
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
index c2b95091d..85cefb51c 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
@@ -31,12 +31,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.workgroup.QueueUser;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Queue details stanza extension, which contains details about the users
  * currently in a queue.
@@ -153,11 +152,11 @@ public final class QueueDetails implements ExtensionElement {
             SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
             QueueDetails queueDetails = new QueueDetails();
 
-            int eventType = parser.getEventType();
-            while (eventType != XmlPullParser.END_TAG &&
+            XmlPullParser.Event eventType = parser.getEventType();
+            while (eventType != XmlPullParser.Event.END_ELEMENT &&
                     "notify-queue-details".equals(parser.getName())) {
                 eventType = parser.next();
-                while ((eventType == XmlPullParser.START_TAG) && "user".equals(parser.getName())) {
+                while ((eventType == XmlPullParser.Event.START_ELEMENT) && "user".equals(parser.getName())) {
                     String uid;
                     int position = -1;
                     int time = -1;
@@ -170,7 +169,7 @@ public final class QueueDetails implements ExtensionElement {
                     }
 
                     eventType = parser.next();
-                    while (eventType != XmlPullParser.END_TAG
+                    while (eventType != XmlPullParser.Event.END_ELEMENT
                                 || !"user".equals(parser.getName())) {
                         if ("position".equals(parser.getName())) {
                             position = Integer.parseInt(parser.nextText());
@@ -197,7 +196,7 @@ public final class QueueDetails implements ExtensionElement {
 
                         eventType = parser.next();
 
-                        if (eventType != XmlPullParser.END_TAG) {
+                        if (eventType != XmlPullParser.Event.END_ELEMENT) {
                             // throw exception
                         }
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
index a8cc1ffa9..59e6239f2 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
@@ -27,12 +27,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.workgroup.agent.WorkgroupQueue;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 public class QueueOverview implements ExtensionElement {
 
     /**
@@ -130,12 +129,11 @@ public class QueueOverview implements ExtensionElement {
         public QueueOverview parse(XmlPullParser parser,
                         int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException,
                         IOException, SmackTextParseException {
-            int eventType = parser.getEventType();
             QueueOverview queueOverview = new QueueOverview();
             SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
 
-            eventType = parser.next();
-            while (eventType != XmlPullParser.END_TAG
+            XmlPullParser.Event eventType = parser.next();
+            while (eventType != XmlPullParser.Event.END_ELEMENT
                          || !ELEMENT_NAME.equals(parser.getName())) {
                 if ("count".equals(parser.getName())) {
                     queueOverview.setUserCount(Integer.parseInt(parser.nextText()));
@@ -156,12 +154,12 @@ public class QueueOverview implements ExtensionElement {
 
                 eventType = parser.next();
 
-                if (eventType != XmlPullParser.END_TAG) {
+                if (eventType != XmlPullParser.Event.END_ELEMENT) {
                     // throw exception
                 }
             }
 
-            if (eventType != XmlPullParser.END_TAG) {
+            if (eventType != XmlPullParser.Event.END_ELEMENT) {
                 // throw exception
             }
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
index 1b3cd9123..27b2461cf 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
@@ -22,9 +22,8 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * An IQ stanza that encapsulates both types of workgroup queue
@@ -106,21 +105,21 @@ public class QueueUpdate implements ExtensionElement {
             while (!done) {
                 parser.next();
                 String elementName = parser.getName();
-                if (parser.getEventType() == XmlPullParser.START_TAG && "position".equals(elementName)) {
+                if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "position".equals(elementName)) {
                     try {
                         position = Integer.parseInt(parser.nextText());
                     }
                     catch (NumberFormatException nfe) {
                     }
                 }
-                else if (parser.getEventType() == XmlPullParser.START_TAG && "time".equals(elementName)) {
+                else if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "time".equals(elementName)) {
                     try {
                         timeRemaining = Integer.parseInt(parser.nextText());
                     }
                     catch (NumberFormatException nfe) {
                     }
                 }
-                else if (parser.getEventType() == XmlPullParser.END_TAG && "queue-status".equals(elementName)) {
+                else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && "queue-status".equals(elementName)) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
index 91932c20e..e2786ca9b 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
@@ -25,13 +25,13 @@ import org.jivesoftware.smack.packet.IQ.IQChildElementXmlStringBuilder;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityJid;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Stanza extension for {@link org.jivesoftware.smackx.workgroup.agent.InvitationRequest}.
@@ -179,7 +179,7 @@ public class RoomInvitation implements ExtensionElement {
             while (!done) {
                 parser.next();
                 String elementName = parser.getName();
-                if (parser.getEventType() == XmlPullParser.START_TAG) {
+                if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT) {
                     if ("session".equals(elementName)) {
                         invitation.sessionID = parser.getAttributeValue("", "id");
                     }
@@ -199,7 +199,7 @@ public class RoomInvitation implements ExtensionElement {
                         invitation.room = JidCreate.entityBareFrom(roomString);
                     }
                 }
-                else if (parser.getEventType() == XmlPullParser.END_TAG && ELEMENT_NAME.equals(elementName)) {
+                else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(elementName)) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
index 619141fa4..7bfb1067f 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
@@ -25,9 +25,8 @@ import org.jivesoftware.smack.packet.IQ.IQChildElementXmlStringBuilder;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.XmlStringBuilder;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * Stanza extension for {@link org.jivesoftware.smackx.workgroup.agent.TransferRequest}.
@@ -175,7 +174,7 @@ public class RoomTransfer implements ExtensionElement {
             while (!done) {
                 parser.next();
                 String elementName = parser.getName();
-                if (parser.getEventType() == XmlPullParser.START_TAG) {
+                if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT) {
                     if ("session".equals(elementName)) {
                         invitation.sessionID = parser.getAttributeValue("", "id");
                     }
@@ -192,7 +191,7 @@ public class RoomTransfer implements ExtensionElement {
                         invitation.room = parser.nextText();
                     }
                 }
-                else if (parser.getEventType() == XmlPullParser.END_TAG && ELEMENT_NAME.equals(elementName)) {
+                else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(elementName)) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
index e3c7cd562..4600573f1 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
@@ -22,9 +22,8 @@ import java.io.IOException;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class SessionID implements ExtensionElement {
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
index 6b7b73066..d16872862 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
@@ -26,9 +26,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * An IQProvider for transcripts.
@@ -44,8 +43,8 @@ public class TranscriptProvider extends IQProvider<Transcript> {
 
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("message")) {
                     packets.add(PacketParserUtils.parseMessage(parser));
                 }
@@ -53,7 +52,7 @@ public class TranscriptProvider extends IQProvider<Transcript> {
                     packets.add(PacketParserUtils.parsePresence(parser));
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("transcript")) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
index e6a4c1a5a..4d750ec7a 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
@@ -24,9 +24,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.PacketParserUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 /**
  * IQ stanza for retrieving the transcript search form, submitting the completed search form
@@ -63,12 +62,12 @@ public class TranscriptSearch extends SimpleIQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT) {
                     // Parse the packet extension
                     PacketParserUtils.addExtensionElement(answer, parser, xmlEnvironment);
                 }
-                else if (eventType == XmlPullParser.END_TAG) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                     if (parser.getName().equals(ELEMENT_NAME)) {
                         done = true;
                     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
index a8341cd02..eb701ee68 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
@@ -28,10 +28,10 @@ import java.util.TimeZone;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * An IQProvider for transcripts summaries.
@@ -53,13 +53,13 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
 
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("transcript")) {
                     summaries.add(parseSummary(parser));
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("transcripts")) {
                     done = true;
                 }
@@ -78,8 +78,8 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
 
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("joinTime")) {
                     try {
                         synchronized (UTC_FORMAT) {
@@ -98,7 +98,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
                     agents = parseAgents(parser);
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("transcript")) {
                     done = true;
                 }
@@ -116,8 +116,8 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
 
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("agentJID")) {
                     agentJID = parser.nextText();
                 }
@@ -141,7 +141,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
                     leftTime = null;
                 }
             }
-            else if (eventType == XmlPullParser.END_TAG) {
+            else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("agents")) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
index 74854307a..806128c56 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
@@ -23,10 +23,10 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class UserID implements ExtensionElement {
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
index 422e17c2d..4fe2fe750 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
@@ -23,10 +23,10 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.EntityBareJid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * A stanza extension that contains information about the user and agent in a
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
index db52078cd..534ddbbed 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
@@ -26,9 +26,8 @@ import java.util.List;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class ChatSettings extends IQ {
 
@@ -128,7 +127,7 @@ public class ChatSettings extends IQ {
 
         @Override
         public ChatSettings parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
-            if (parser.getEventType() != XmlPullParser.START_TAG) {
+            if (parser.getEventType() != XmlPullParser.Event.START_ELEMENT) {
                 throw new IllegalStateException("Parser not in proper position, or bad XML.");
             }
 
@@ -136,12 +135,12 @@ public class ChatSettings extends IQ {
 
             boolean done = false;
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "chat-setting".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "chat-setting".equals(parser.getName())) {
                     chatSettings.addSetting(parseChatSetting(parser));
 
                 }
-                else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(parser.getName())) {
                     done = true;
                 }
             }
@@ -156,17 +155,17 @@ public class ChatSettings extends IQ {
             int type = 0;
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "key".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "key".equals(parser.getName())) {
                     key = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "value".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "value".equals(parser.getName())) {
                     value = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "type".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "type".equals(parser.getName())) {
                     type = Integer.parseInt(parser.nextText());
                 }
-                else if (eventType == XmlPullParser.END_TAG && "chat-setting".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "chat-setting".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
index 0530bec32..d9f9e405c 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
@@ -25,9 +25,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class GenericSettings extends IQ {
 
@@ -88,15 +87,15 @@ public class GenericSettings extends IQ {
 
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "entry".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "entry".equals(parser.getName())) {
                     eventType = parser.next();
                     String name = parser.nextText();
                     eventType = parser.next();
                     String value = parser.nextText();
                     setting.getMap().put(name, value);
                 }
-                else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
index 7da5a6459..10c570a45 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
@@ -23,9 +23,8 @@ import org.jivesoftware.smack.packet.SimpleIQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class OfflineSettings extends SimpleIQ {
     private String redirectURL;
@@ -118,20 +117,20 @@ public class OfflineSettings extends SimpleIQ {
             String emailAddress = null;
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "redirectPage".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "redirectPage".equals(parser.getName())) {
                     redirectPage = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "subject".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "subject".equals(parser.getName())) {
                     subject = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "offlineText".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "offlineText".equals(parser.getName())) {
                     offlineText = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.START_TAG && "emailAddress".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "emailAddress".equals(parser.getName())) {
                     emailAddress = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.END_TAG && "offline-settings".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "offline-settings".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
index d2a329bf0..5c688c959 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
@@ -22,9 +22,8 @@ import org.jivesoftware.smack.packet.SimpleIQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class SearchSettings extends SimpleIQ {
     private String forumsLocation;
@@ -87,14 +86,14 @@ public class SearchSettings extends SimpleIQ {
             String forums = null;
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "forums".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "forums".equals(parser.getName())) {
                     forums = parser.nextText();
                 }
-                else if ((eventType == XmlPullParser.START_TAG) && "kb".equals(parser.getName())) {
+                else if ((eventType == XmlPullParser.Event.START_ELEMENT) && "kb".equals(parser.getName())) {
                     kb = parser.nextText();
                 }
-                else if (eventType == XmlPullParser.END_TAG && "search-settings".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "search-settings".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
index deb7fc4dd..a7bcf0f49 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
@@ -23,9 +23,8 @@ import org.jivesoftware.smack.packet.SimpleIQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.stringencoder.Base64;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class SoundSettings extends SimpleIQ {
     private String outgoingSound;
@@ -76,14 +75,14 @@ public class SoundSettings extends SimpleIQ {
 
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "outgoingSound".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "outgoingSound".equals(parser.getName())) {
                     soundSettings.setOutgoingSound(parser.nextText());
                 }
-                else if ((eventType == XmlPullParser.START_TAG) && "incomingSound".equals(parser.getName())) {
+                else if ((eventType == XmlPullParser.Event.START_ELEMENT) && "incomingSound".equals(parser.getName())) {
                     soundSettings.setIncomingSound(parser.nextText());
                 }
-                else if (eventType == XmlPullParser.END_TAG && "sound-settings".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "sound-settings".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
index 0603d6bf9..74c42bda1 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
@@ -23,9 +23,8 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.IQProvider;
 import org.jivesoftware.smack.util.StringUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class WorkgroupProperties extends IQ {
 
@@ -103,19 +102,19 @@ public class WorkgroupProperties extends IQ {
 
 
             while (!done) {
-                int eventType = parser.next();
-                if (eventType == XmlPullParser.START_TAG && "authRequired".equals(parser.getName())) {
+                XmlPullParser.Event eventType = parser.next();
+                if (eventType == XmlPullParser.Event.START_ELEMENT && "authRequired".equals(parser.getName())) {
                     // CHECKSTYLE:OFF
                     props.setAuthRequired(Boolean.valueOf(parser.nextText()).booleanValue());
                     // CHECKSTYLE:ON
                 }
-                else if (eventType == XmlPullParser.START_TAG && "email".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "email".equals(parser.getName())) {
                     props.setEmail(parser.nextText());
                 }
-                else if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.START_ELEMENT && "name".equals(parser.getName())) {
                     props.setFullName(parser.nextText());
                 }
-                else if (eventType == XmlPullParser.END_TAG && "workgroup-properties".equals(parser.getName())) {
+                else if (eventType == XmlPullParser.Event.END_ELEMENT && "workgroup-properties".equals(parser.getName())) {
                     done = true;
                 }
             }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index 4b6a0288e..f360fd972 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -390,7 +390,7 @@ public class Workgroup {
      * @throws SmackException
      * @throws InterruptedException
      */
-    public void joinQueue(Map<String,Object> metadata, Jid userID) throws XMPPException, SmackException, InterruptedException {
+    public void joinQueue(Map<String, Object> metadata, Jid userID) throws XMPPException, SmackException, InterruptedException {
         // If already in the queue ignore the join request.
         if (inQueue) {
             throw new IllegalStateException("Already in queue " + workgroupJID);
@@ -403,9 +403,9 @@ public class Workgroup {
             String name = iter.next();
             String value = metadata.get(name).toString();
 
-            FormField field = new FormField(name);
+            FormField.Builder field = FormField.builder(name);
             field.setType(FormField.Type.text_single);
-            form.addField(field);
+            form.addField(field.build());
             form.setAnswer(name, value);
         }
         joinQueue(form, userID);
@@ -478,17 +478,13 @@ public class Workgroup {
 
     private void fireInvitationEvent(WorkgroupInvitation invitation) {
         for (WorkgroupInvitationListener listener : invitationListeners) {
-            // CHECKSTYLE:OFF
-    	    listener.invitationReceived(invitation);
-            // CHECKSTYLE:ON
+            listener.invitationReceived(invitation);
         }
     }
 
     private void fireQueueJoinedEvent() {
         for (QueueListener listener : queueListeners) {
-            // CHECKSTYLE:OFF
-    	    listener.joinedQueue();
-            // CHECKSTYLE:ON
+            listener.joinedQueue();
         }
     }
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
index b17da1211..29170b479 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
@@ -24,10 +24,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.workgroup.MetaData;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.workgroup.MetaData;
 
 /**
  * Utility class for meta-data parsing and writing.
@@ -46,18 +46,18 @@ public class MetaDataUtils {
      * @throws IOException            if an error occurs while parsing the XML.
      */
     public static Map<String, List<String>> parseMetaData(XmlPullParser parser) throws XmlPullParserException, IOException {
-        int eventType = parser.getEventType();
+        XmlPullParser.Event eventType = parser.getEventType();
 
         // If correctly positioned on an opening meta-data tag, parse meta-data.
-        if ((eventType == XmlPullParser.START_TAG)
+        if ((eventType == XmlPullParser.Event.START_ELEMENT)
                 && parser.getName().equals(MetaData.ELEMENT_NAME)
                 && parser.getNamespace().equals(MetaData.NAMESPACE)) {
             Map<String, List<String>> metaData = new Hashtable<>();
 
-            eventType = parser.nextTag();
+            eventType = parser.next();
 
             // Keep parsing until we've gotten to end of meta-data.
-            while ((eventType != XmlPullParser.END_TAG)
+            while ((eventType != XmlPullParser.Event.END_ELEMENT)
                     || !parser.getName().equals(MetaData.ELEMENT_NAME)) {
                 String name = parser.getAttributeValue(0);
                 String value = parser.nextText();
@@ -72,7 +72,7 @@ public class MetaDataUtils {
                     metaData.put(name, values);
                 }
 
-                eventType = parser.nextTag();
+                eventType = parser.next();
             }
 
             return metaData;
@@ -84,7 +84,7 @@ public class MetaDataUtils {
     /**
      * Serializes a Map of String name/value pairs into the meta-data XML format.
      *
-     * @param metaData the Map of meta-data as Map&lt;String,List&lt;String&gt;&gt;
+     * @param metaData the Map of meta-data as Map&lt;String, List&lt;String&gt;&gt;
      * @return the meta-data values in XML form.
      */
     public static String serializeMetaData(Map<String, List<String>> metaData) {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
index 719bbe5bf..a2af202a2 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
@@ -21,12 +21,11 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xevent.packet.MessageEvent;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  *
  * The MessageEventProvider parses Message Event packets.
@@ -49,8 +48,8 @@ public class MessageEventProvider extends ExtensionElementProvider<MessageEvent>
         MessageEvent messageEvent = new MessageEvent();
         boolean done = false;
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("id"))
                     messageEvent.setStanzaId(parser.nextText());
                 if (parser.getName().equals(MessageEvent.COMPOSING))
@@ -61,7 +60,7 @@ public class MessageEventProvider extends ExtensionElementProvider<MessageEvent>
                     messageEvent.setDisplayed(true);
                 if (parser.getName().equals(MessageEvent.OFFLINE))
                     messageEvent.setOffline(true);
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("x")) {
                     done = true;
                 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
index f5e7b2cc0..2baeb5697 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
@@ -23,13 +23,13 @@ import java.util.ArrayList;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.xroster.RemoteRosterEntry;
 import org.jivesoftware.smackx.xroster.packet.RosterExchange;
 
 import org.jxmpp.jid.Jid;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  *
@@ -50,30 +50,29 @@ public class RosterExchangeProvider extends ExtensionElementProvider<RosterExcha
     @Override
     public RosterExchange parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
                     throws XmlPullParserException, IOException {
-        // CHECKSTYLE:OFF
         RosterExchange rosterExchange = new RosterExchange();
         boolean done = false;
         RemoteRosterEntry remoteRosterEntry;
         Jid jid = null;
-		String name = "";
-		ArrayList<String> groupsName = new ArrayList<>();
+        String name = "";
+        ArrayList<String> groupsName = new ArrayList<>();
         while (!done) {
-            int eventType = parser.next();
-            if (eventType == XmlPullParser.START_TAG) {
+            XmlPullParser.Event eventType = parser.next();
+            if (eventType == XmlPullParser.Event.START_ELEMENT) {
                 if (parser.getName().equals("item")) {
-                	// Reset this variable since they are optional for each item
-					groupsName = new ArrayList<>();
-					// Initialize the variables from the parsed XML
+                    // Reset this variable since they are optional for each item
+                    groupsName = new ArrayList<>();
+                    // Initialize the variables from the parsed XML
                     jid = ParserUtils.getJidAttribute(parser);
                     name = parser.getAttributeValue("", "name");
                 }
                 if (parser.getName().equals("group")) {
-					groupsName.add(parser.nextText());
+                    groupsName.add(parser.nextText());
                 }
-            } else if (eventType == XmlPullParser.END_TAG) {
+            } else if (eventType == XmlPullParser.Event.END_ELEMENT) {
                 if (parser.getName().equals("item")) {
-					// Create packet.
-					remoteRosterEntry = new RemoteRosterEntry(jid, name, groupsName.toArray(new String[groupsName.size()]));
+                    // Create packet.
+                    remoteRosterEntry = new RemoteRosterEntry(jid, name, groupsName.toArray(new String[groupsName.size()]));
                     rosterExchange.addRosterEntry(remoteRosterEntry);
                 }
                 if (parser.getName().equals("x")) {
@@ -81,7 +80,6 @@ public class RosterExchangeProvider extends ExtensionElementProvider<RosterExcha
                 }
             }
         }
-        // CHECKSTYLE:ON
         return rosterExchange;
 
     }
diff --git a/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java b/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java
index 6707799fe..1f85512aa 100644
--- a/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java
+++ b/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java
@@ -16,13 +16,13 @@
  */
 package org.jivesoftware.smackx;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 
 import org.jivesoftware.smack.legacy.LegacyInitializer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LegacyInitializerTest {
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java
index fb8181174..0c62c28c0 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/FileBasedOmemoStore.java
@@ -38,6 +38,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.stringencoder.BareJidEncoder;
+
 import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
 import org.jivesoftware.smackx.omemo.internal.OmemoCachedDeviceList;
 import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
index 86c181101..383dc3570 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoManager.java
@@ -44,6 +44,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.Async;
+
 import org.jivesoftware.smackx.carbons.CarbonCopyReceivedListener;
 import org.jivesoftware.smackx.carbons.CarbonManager;
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
@@ -97,7 +98,7 @@ public final class OmemoManager extends Manager {
     private static final Integer UNKNOWN_DEVICE_ID = -1;
     final Object LOCK = new Object();
 
-    private static final WeakHashMap<XMPPConnection, TreeMap<Integer,OmemoManager>> INSTANCES = new WeakHashMap<>();
+    private static final WeakHashMap<XMPPConnection, TreeMap<Integer, OmemoManager>> INSTANCES = new WeakHashMap<>();
     private final OmemoService<?, ?, ?, ?, ?, ?, ?, ?, ?> service;
 
     private final HashSet<OmemoMessageListener> omemoMessageListeners = new HashSet<>();
@@ -156,7 +157,7 @@ public final class OmemoManager extends Manager {
             throw new IllegalArgumentException("DeviceId MUST NOT be null and MUST be greater than 0.");
         }
 
-        TreeMap<Integer,OmemoManager> managersOfConnection = INSTANCES.get(connection);
+        TreeMap<Integer, OmemoManager> managersOfConnection = INSTANCES.get(connection);
         if (managersOfConnection == null) {
             managersOfConnection = new TreeMap<>();
             INSTANCES.put(connection, managersOfConnection);
@@ -937,7 +938,7 @@ public final class OmemoManager extends Manager {
      *
      * @return omemoService
      */
-    OmemoService<?,?,?,?,?,?,?,?,?> getOmemoService() {
+    OmemoService<?, ?, ?, ?, ?, ?, ?, ?, ?> getOmemoService() {
         throwIfNoServiceSet();
         return service;
     }
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java
index 0883407f3..56a703f82 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoMessage.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
 import org.jivesoftware.smackx.hints.element.StoreHint;
 import org.jivesoftware.smackx.omemo.element.OmemoElement;
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java
index 88d40d033..28ffc50ef 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoRatchet.java
@@ -16,15 +16,15 @@
  */
 package org.jivesoftware.smackx.omemo;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
 
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.omemo.element.OmemoElement;
 import org.jivesoftware.smackx.omemo.element.OmemoKeyElement;
 import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
@@ -133,7 +133,7 @@ public abstract class OmemoRatchet<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
             // copy key part into messageKey
             System.arraycopy(unpackedKey, 0, messageKey, 0, 16);
             // copy tag part into authTag
-            System.arraycopy(unpackedKey, 16, authTag, 0,16);
+            System.arraycopy(unpackedKey, 16, authTag, 0, 16);
         } else if (element.isKeyTransportElement() && unpackedKey.length == 16) {
             messageKey = unpackedKey;
         } else {
@@ -167,10 +167,9 @@ public abstract class OmemoRatchet<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         byte[] encryptedBody = payloadAndAuthTag(element, cipherAndAuthTag.getAuthTag());
 
         try {
-            String plaintext = new String(cipherAndAuthTag.getCipher().doFinal(encryptedBody), StringUtils.UTF8);
+            String plaintext = new String(cipherAndAuthTag.getCipher().doFinal(encryptedBody), StandardCharsets.UTF_8);
             return plaintext;
-
-        } catch (UnsupportedEncodingException | IllegalBlockSizeException | BadPaddingException e) {
+        } catch (IllegalBlockSizeException | BadPaddingException e) {
             throw new CryptoFailedException("decryptMessageElement could not decipher message body: "
                     + e.getMessage());
         }
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index e4c93a0d1..8cf2aac6f 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -19,7 +19,6 @@ package org.jivesoftware.smackx.omemo;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYLENGTH;
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYTYPE;
 
-import java.io.UnsupportedEncodingException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -35,6 +34,7 @@ import java.util.Random;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
@@ -45,6 +45,7 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.StanzaError;
+
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
 import org.jivesoftware.smackx.mam.MamManager;
 import org.jivesoftware.smackx.muc.MultiUserChat;
@@ -307,7 +308,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         try {
             builder = new OmemoMessageBuilder<>(userDevice, gullibleTrustCallback, getOmemoRatchet(manager),
                     messageKey, iv, null);
-        } catch (InvalidKeyException | InvalidAlgorithmParameterException | NoSuchPaddingException | BadPaddingException | UnsupportedEncodingException | IllegalBlockSizeException e) {
+        } catch (InvalidKeyException | InvalidAlgorithmParameterException | NoSuchPaddingException | BadPaddingException | IllegalBlockSizeException e) {
             throw new CryptoFailedException(e);
         }
 
@@ -369,7 +370,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         try {
             builder = new OmemoMessageBuilder<>(
                     userDevice, manager.getTrustCallback(), getOmemoRatchet(managerGuard.get()), messageKey, iv, message);
-        } catch (UnsupportedEncodingException | BadPaddingException | IllegalBlockSizeException |
+        } catch (BadPaddingException | IllegalBlockSizeException |
                 NoSuchPaddingException | InvalidAlgorithmParameterException | InvalidKeyException | NoSuchAlgorithmException e) {
             throw new CryptoFailedException(e);
         }
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
index 4626f6e00..033db6994 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoStore.java
@@ -27,6 +27,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.SmackException;
+
 import org.jivesoftware.smackx.omemo.element.OmemoBundleElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.element.OmemoDeviceListElement;
 import org.jivesoftware.smackx.omemo.exceptions.CannotEstablishOmemoSessionException;
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java
index 34e222bbc..2b2515cb4 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java
@@ -23,6 +23,7 @@ import java.util.Set;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.omemo.internal.OmemoCachedDeviceList;
 
 /**
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java
index 6f3ca4c2b..d594fe614 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/UntrustedOmemoIdentityException.java
@@ -80,7 +80,7 @@ public class UntrustedOmemoIdentityException extends Exception {
     }
 
     @Override
-    public String toString() {
+    public String getMessage() {
         if (trustedKey != null) {
             return "Untrusted OMEMO Identity encountered:\n" +
                     "Fingerprint of trusted key:\n" + trustedKey.blocksOf8Chars() + "\n" +
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/CipherAndAuthTag.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/CipherAndAuthTag.java
index 3f03f2f72..15f4fa27f 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/CipherAndAuthTag.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/CipherAndAuthTag.java
@@ -21,6 +21,7 @@ import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYTYPE;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
+
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoCarbonCopyStanzaReceivedListener.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoCarbonCopyStanzaReceivedListener.java
index e9239ea24..4d766025c 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoCarbonCopyStanzaReceivedListener.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoCarbonCopyStanzaReceivedListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.omemo.internal.listener;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
 import org.jivesoftware.smackx.omemo.OmemoManager;
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoMessageStanzaReceivedListener.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoMessageStanzaReceivedListener.java
index 0c6e95a58..031f259d8 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoMessageStanzaReceivedListener.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/internal/listener/OmemoMessageStanzaReceivedListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.omemo.internal.listener;
 
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.omemo.OmemoManager;
 
 public interface OmemoMessageStanzaReceivedListener {
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMessageListener.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMessageListener.java
index 8e4d0ddd0..e5efa6e5a 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMessageListener.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMessageListener.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.omemo.listener;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.carbons.packet.CarbonExtension;
 import org.jivesoftware.smackx.omemo.OmemoMessage;
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMucMessageListener.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMucMessageListener.java
index 15d9685be..90683e5ee 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMucMessageListener.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/listener/OmemoMucMessageListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.omemo.listener;
 
 import org.jivesoftware.smack.packet.Stanza;
+
 import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.jivesoftware.smackx.omemo.OmemoMessage;
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoBundleVAxolotlProvider.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoBundleVAxolotlProvider.java
index b4c519a73..e45d35a48 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoBundleVAxolotlProvider.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoBundleVAxolotlProvider.java
@@ -24,20 +24,17 @@ import static org.jivesoftware.smackx.omemo.element.OmemoBundleElement.PRE_KEY_P
 import static org.jivesoftware.smackx.omemo.element.OmemoBundleElement.SIGNED_PRE_KEY_ID;
 import static org.jivesoftware.smackx.omemo.element.OmemoBundleElement.SIGNED_PRE_KEY_PUB;
 import static org.jivesoftware.smackx.omemo.element.OmemoBundleElement.SIGNED_PRE_KEY_SIG;
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
 
 import java.io.IOException;
 import java.util.HashMap;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.omemo.element.OmemoBundleElement_VAxolotl;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Smack ExtensionProvider that parses OMEMO bundle element into OmemoBundleElement objects.
  *
@@ -56,13 +53,14 @@ public class OmemoBundleVAxolotlProvider extends ExtensionElementProvider<OmemoB
         HashMap<Integer, String> preKeys = new HashMap<>();
 
         while (!stop) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
             switch (tag) {
-                case START_TAG:
+                case START_ELEMENT:
+                    final int attributeCount = parser.getAttributeCount();
                     // <signedPreKeyPublic>
                     if (name.equals(SIGNED_PRE_KEY_PUB)) {
-                        for (int i = 0; i < parser.getAttributeCount(); i++) {
+                        for (int i = 0; i < attributeCount; i++) {
                             if (parser.getAttributeName(i).equals(SIGNED_PRE_KEY_ID)) {
                                 int id = Integer.parseInt(parser.getAttributeValue(i));
                                 signedPreKey = parser.nextText();
@@ -84,7 +82,7 @@ public class OmemoBundleVAxolotlProvider extends ExtensionElementProvider<OmemoB
                     }
                     // <preKeyPublic preKeyId='424242'>
                     else if (inPreKeys && name.equals(PRE_KEY_PUB)) {
-                        for (int i = 0; i < parser.getAttributeCount(); i++) {
+                        for (int i = 0; i < attributeCount; i++) {
                             if (parser.getAttributeName(i).equals(PRE_KEY_ID)) {
                                 preKeys.put(Integer.parseInt(parser.getAttributeValue(i)),
                                         parser.nextText());
@@ -92,11 +90,14 @@ public class OmemoBundleVAxolotlProvider extends ExtensionElementProvider<OmemoB
                         }
                     }
                     break;
-                case END_TAG:
+                case END_ELEMENT:
                     if (name.equals(BUNDLE)) {
                         stop = true;
                     }
                     break;
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
         return new OmemoBundleElement_VAxolotl(signedPreKeyId, signedPreKey, signedPreKeySignature, identityKey, preKeys);
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoDeviceListVAxolotlProvider.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoDeviceListVAxolotlProvider.java
index 8a5db94d3..173a14b58 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoDeviceListVAxolotlProvider.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoDeviceListVAxolotlProvider.java
@@ -19,8 +19,6 @@ package org.jivesoftware.smackx.omemo.provider;
 import static org.jivesoftware.smackx.omemo.element.OmemoDeviceListElement.DEVICE;
 import static org.jivesoftware.smackx.omemo.element.OmemoDeviceListElement.ID;
 import static org.jivesoftware.smackx.omemo.element.OmemoDeviceListElement.LIST;
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -28,12 +26,11 @@ import java.util.Set;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.omemo.element.OmemoDeviceListElement_VAxolotl;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Smack ExtensionProvider that parses OMEMO device list element into OmemoDeviceListElement objects.
  *
@@ -46,10 +43,10 @@ public class OmemoDeviceListVAxolotlProvider extends ExtensionElementProvider<Om
         Set<Integer> deviceListIds = new HashSet<>();
         boolean stop = false;
         while (!stop) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
             switch (tag) {
-                case START_TAG:
+                case START_ELEMENT:
                     if (name.equals(DEVICE)) {
                         for (int i = 0; i < parser.getAttributeCount(); i++) {
                             if (parser.getAttributeName(i).equals(ID)) {
@@ -59,11 +56,14 @@ public class OmemoDeviceListVAxolotlProvider extends ExtensionElementProvider<Om
                         }
                     }
                     break;
-                case END_TAG:
+                case END_ELEMENT:
                     if (name.equals(LIST)) {
                         stop = true;
                     }
                     break;
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
         return new OmemoDeviceListElement_VAxolotl(deviceListIds);
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoVAxolotlProvider.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoVAxolotlProvider.java
index 461367661..1fa0d05ea 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoVAxolotlProvider.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/provider/OmemoVAxolotlProvider.java
@@ -18,8 +18,6 @@ package org.jivesoftware.smackx.omemo.provider;
 
 import static org.jivesoftware.smackx.omemo.element.OmemoElement.ATTR_PAYLOAD;
 import static org.jivesoftware.smackx.omemo.element.OmemoElement.NAME_ENCRYPTED;
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,14 +25,14 @@ import java.util.ArrayList;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.omemo.element.OmemoElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.element.OmemoHeaderElement;
 import org.jivesoftware.smackx.omemo.element.OmemoHeaderElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.element.OmemoKeyElement;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Smack ExtensionProvider that parses incoming OMEMO Message element into OmemoMessageElement objects.
  *
@@ -51,10 +49,10 @@ public class OmemoVAxolotlProvider extends ExtensionElementProvider<OmemoElement
         byte[] payload = null;
 
         while (inEncrypted) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
             switch (tag) {
-                case START_TAG:
+                case START_ELEMENT:
                     switch (name) {
                         case OmemoHeaderElement.NAME_HEADER:
                             for (int i = 0; i < parser.getAttributeCount(); i++) {
@@ -83,11 +81,14 @@ public class OmemoVAxolotlProvider extends ExtensionElementProvider<OmemoElement
                             break;
                     }
                     break;
-                case END_TAG:
+                case END_ELEMENT:
                     if (name.equals(NAME_ENCRYPTED)) {
                         inEncrypted = false;
                     }
                     break;
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
         OmemoHeaderElement_VAxolotl header = new OmemoHeaderElement_VAxolotl(sid, keys, iv);
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/MessageOrOmemoMessage.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/MessageOrOmemoMessage.java
index 81683e358..1e6ce8628 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/MessageOrOmemoMessage.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/MessageOrOmemoMessage.java
@@ -18,6 +18,7 @@ package org.jivesoftware.smackx.omemo.util;
 
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.Objects;
+
 import org.jivesoftware.smackx.omemo.OmemoMessage;
 
 public class MessageOrOmemoMessage {
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
index 7a625ee15..197aab42d 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/util/OmemoMessageBuilder.java
@@ -21,12 +21,14 @@ import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYLENGTH
 import static org.jivesoftware.smackx.omemo.util.OmemoConstants.Crypto.KEYTYPE;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
@@ -36,7 +38,6 @@ import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.omemo.OmemoRatchet;
 import org.jivesoftware.smackx.omemo.OmemoService;
 import org.jivesoftware.smackx.omemo.element.OmemoElement;
@@ -94,7 +95,6 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      * @throws InvalidKeyException
      * @throws NoSuchAlgorithmException
      * @throws IllegalBlockSizeException
-     * @throws UnsupportedEncodingException
      * @throws InvalidAlgorithmParameterException
      */
     public OmemoMessageBuilder(OmemoDevice userDevice,
@@ -105,7 +105,7 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
                                String message)
             throws NoSuchPaddingException, BadPaddingException, InvalidKeyException, NoSuchAlgorithmException,
             IllegalBlockSizeException,
-            UnsupportedEncodingException, InvalidAlgorithmParameterException {
+            InvalidAlgorithmParameterException {
         this.userDevice = userDevice;
         this.trustCallback = callback;
         this.ratchet = ratchet;
@@ -150,11 +150,12 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
      * @throws NoSuchProviderException
      * @throws InvalidAlgorithmParameterException
      * @throws InvalidKeyException
-     * @throws UnsupportedEncodingException
      * @throws BadPaddingException
      * @throws IllegalBlockSizeException
      */
-    private void setMessage(String message) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, InvalidKeyException, UnsupportedEncodingException, BadPaddingException, IllegalBlockSizeException {
+    private void setMessage(String message)
+                    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidAlgorithmParameterException,
+                    InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
         if (message == null) {
             return;
         }
@@ -168,7 +169,7 @@ public class OmemoMessageBuilder<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_
         byte[] body;
         byte[] ciphertext;
 
-        body = message.getBytes(StringUtils.UTF8);
+        body = message.getBytes(StandardCharsets.UTF_8);
         ciphertext = cipher.doFinal(body);
 
         byte[] clearKeyWithAuthTag = new byte[messageKey.length + 16];
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoBundleVAxolotlElementTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoBundleVAxolotlElementTest.java
index c19f5dd44..ae937c90d 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoBundleVAxolotlElementTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoBundleVAxolotlElementTest.java
@@ -19,18 +19,19 @@ package org.jivesoftware.smackx.omemo;
 import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.omemo.element.OmemoBundleElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.provider.OmemoBundleVAxolotlProvider;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Test serialization and parsing of the OmemoBundleVAxolotlElement.
@@ -40,12 +41,12 @@ public class OmemoBundleVAxolotlElementTest extends SmackTestSuite {
     @Test
     public void serializationTest() throws Exception {
         int signedPreKeyId = 420;
-        String signedPreKeyB64 = Base64.encodeToString("SignedPreKey".getBytes(StringUtils.UTF8));
-        String signedPreKeySigB64 = Base64.encodeToString("SignedPreKeySignature".getBytes(StringUtils.UTF8));
-        String identityKeyB64 = Base64.encodeToString("IdentityKey".getBytes(StringUtils.UTF8));
+        String signedPreKeyB64 = Base64.encodeToString("SignedPreKey".getBytes(StandardCharsets.UTF_8));
+        String signedPreKeySigB64 = Base64.encodeToString("SignedPreKeySignature".getBytes(StandardCharsets.UTF_8));
+        String identityKeyB64 = Base64.encodeToString("IdentityKey".getBytes(StandardCharsets.UTF_8));
         int preKeyId1 = 220, preKeyId2 = 284;
-        String preKey1B64 = Base64.encodeToString("FirstPreKey".getBytes(StringUtils.UTF8)),
-                preKey2B64 = Base64.encodeToString("SecondPreKey".getBytes(StringUtils.UTF8));
+        String preKey1B64 = Base64.encodeToString("FirstPreKey".getBytes(StandardCharsets.UTF_8)),
+                preKey2B64 = Base64.encodeToString("SecondPreKey".getBytes(StandardCharsets.UTF_8));
         HashMap<Integer, String> preKeysB64 = new HashMap<>();
         preKeysB64.put(preKeyId1, preKey1B64);
         preKeysB64.put(preKeyId2, preKey2B64);
@@ -79,11 +80,11 @@ public class OmemoBundleVAxolotlElementTest extends SmackTestSuite {
         String actual = bundle.toXML().toString();
         assertEquals("Bundles XML must match.", expected, actual);
 
-        byte[] signedPreKey = "SignedPreKey".getBytes(StringUtils.UTF8);
-        byte[] signedPreKeySig = "SignedPreKeySignature".getBytes(StringUtils.UTF8);
-        byte[] identityKey = "IdentityKey".getBytes(StringUtils.UTF8);
-        byte[] firstPreKey = "FirstPreKey".getBytes(StringUtils.UTF8);
-        byte[] secondPreKey = "SecondPreKey".getBytes(StringUtils.UTF8);
+        byte[] signedPreKey = "SignedPreKey".getBytes(StandardCharsets.UTF_8);
+        byte[] signedPreKeySig = "SignedPreKeySignature".getBytes(StandardCharsets.UTF_8);
+        byte[] identityKey = "IdentityKey".getBytes(StandardCharsets.UTF_8);
+        byte[] firstPreKey = "FirstPreKey".getBytes(StandardCharsets.UTF_8);
+        byte[] secondPreKey = "SecondPreKey".getBytes(StandardCharsets.UTF_8);
 
         OmemoBundleElement_VAxolotl parsed = new OmemoBundleVAxolotlProvider().parse(TestUtils.getParser(actual));
 
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoDeviceListVAxolotlElementTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoDeviceListVAxolotlElementTest.java
index 946da1d1e..da99b8e79 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoDeviceListVAxolotlElementTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoDeviceListVAxolotlElementTest.java
@@ -23,12 +23,12 @@ import java.util.HashSet;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 import org.jivesoftware.smackx.omemo.element.OmemoDeviceListElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.provider.OmemoDeviceListVAxolotlProvider;
 
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Test serialization and parsing of DeviceListElement.
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java
index a258f4875..5bc94377e 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoExceptionsTest.java
@@ -97,7 +97,7 @@ public class OmemoExceptionsTest {
         ArrayList<CryptoFailedException> el = new ArrayList<>();
         try {
             MultipleCryptoFailedException m2 = MultipleCryptoFailedException.from(el);
-            fail("MultipleCryptoFailedException must not allow empty list.");
+            fail("MultipleCryptoFailedException must not allow empty list, but returned: " + m2);
         } catch (IllegalArgumentException e) {
             // Expected
         }
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoKeyUtilTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoKeyUtilTest.java
index 4b21a0801..fc071ac11 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoKeyUtilTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoKeyUtilTest.java
@@ -27,6 +27,7 @@ import java.util.TreeMap;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+
 import org.jivesoftware.smackx.omemo.element.OmemoBundleElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.exceptions.CorruptedOmemoKeyException;
 import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
@@ -122,7 +123,7 @@ extends SmackTestSuite {
         int high = Integer.MAX_VALUE - 2;
         int max = Integer.MAX_VALUE;
         assertEquals(OmemoKeyUtil.addInBounds(high, 3), 1);
-        assertEquals(OmemoKeyUtil.addInBounds(1,2), 3);
+        assertEquals(OmemoKeyUtil.addInBounds(1, 2), 3);
         assertEquals(OmemoKeyUtil.addInBounds(max, 5), 5);
     }
 
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoServiceTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoServiceTest.java
index 73c891604..c3d10aa65 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoServiceTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoServiceTest.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.HashSet;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.omemo.internal.OmemoDevice;
 
 import org.junit.Test;
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java
index a4e8bd58e..369c682d9 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoStoreTest.java
@@ -269,8 +269,8 @@ public abstract class OmemoStoreTest<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey
 
     @Test
     public void loadStoreCachedDeviceList() throws IOException {
-        Integer[] active = new Integer[] {1,5,999,10};
-        Integer[] inactive = new Integer[] {6,7,8};
+        Integer[] active = new Integer[] {1, 5, 999, 10};
+        Integer[] inactive = new Integer[] {6, 7, 8};
         OmemoCachedDeviceList before = new OmemoCachedDeviceList(
                 new HashSet<>(Arrays.asList(active)),
                 new HashSet<>(Arrays.asList(inactive)));
diff --git a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoVAxolotlElementTest.java b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoVAxolotlElementTest.java
index c434b679e..1d4e1a49e 100644
--- a/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoVAxolotlElementTest.java
+++ b/smack-omemo/src/test/java/org/jivesoftware/smackx/omemo/OmemoVAxolotlElementTest.java
@@ -18,12 +18,13 @@ package org.jivesoftware.smackx.omemo;
 
 import static org.junit.Assert.assertEquals;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
-import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+
 import org.jivesoftware.smackx.omemo.element.OmemoElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.element.OmemoHeaderElement_VAxolotl;
 import org.jivesoftware.smackx.omemo.element.OmemoKeyElement;
@@ -39,11 +40,11 @@ public class OmemoVAxolotlElementTest extends SmackTestSuite {
 
     @Test
     public void serializationTest() throws Exception {
-        byte[] payload = "This is payload.".getBytes(StringUtils.UTF8);
+        byte[] payload = "This is payload.".getBytes(StandardCharsets.UTF_8);
         int keyId1 = 8;
         int keyId2 = 33333;
-        byte[] keyData1 = "KEYDATA".getBytes(StringUtils.UTF8);
-        byte[] keyData2 = "DATAKEY".getBytes(StringUtils.UTF8);
+        byte[] keyData1 = "KEYDATA".getBytes(StandardCharsets.UTF_8);
+        byte[] keyData2 = "DATAKEY".getBytes(StandardCharsets.UTF_8);
         int sid = 12131415;
         byte[] iv = OmemoMessageBuilder.generateIv();
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
index 78ec3fb69..9e1fa32f1 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
@@ -31,6 +31,7 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+
 import org.jivesoftware.smackx.ox.element.PubkeyElement;
 import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
 import org.jivesoftware.smackx.ox.exception.MissingUserIdOnKeyException;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
index e69fb199e..d84c0cd25 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpManager.java
@@ -43,6 +43,8 @@ import org.jivesoftware.smack.chat2.IncomingChatMessageListener;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.Async;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.ox.callback.backup.AskForBackupCodeCallback;
 import org.jivesoftware.smackx.ox.callback.backup.DisplayBackupCodeCallback;
@@ -89,7 +91,6 @@ import org.pgpainless.key.OpenPgpV4Fingerprint;
 import org.pgpainless.key.collection.PGPKeyRing;
 import org.pgpainless.key.protection.SecretKeyRingProtector;
 import org.pgpainless.util.BCUtil;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Entry point for Smacks API for OpenPGP for XMPP.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
index b2472576b..5c02c5d69 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpMessage.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 
 import org.jivesoftware.smack.util.Objects;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.ox.element.CryptElement;
 import org.jivesoftware.smackx.ox.element.OpenPgpContentElement;
 import org.jivesoftware.smackx.ox.element.OpenPgpElement;
@@ -28,7 +30,6 @@ import org.jivesoftware.smackx.ox.element.SigncryptElement;
 import org.jivesoftware.smackx.ox.provider.OpenPgpContentElementProvider;
 
 import org.pgpainless.decryption_verification.OpenPgpMetadata;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * This class embodies a decrypted and/or verified {@link OpenPgpElement}.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java
index 70004516d..08011b2f5 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/crypto/PainlessOpenPgpProvider.java
@@ -28,6 +28,7 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.OpenPgpMessage;
 import org.jivesoftware.smackx.ox.OpenPgpSelf;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpContentElement.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpContentElement.java
index db7014eef..47c2295b6 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpContentElement.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpContentElement.java
@@ -16,8 +16,6 @@
  */
 package org.jivesoftware.smackx.ox.element;
 
-import static org.jivesoftware.smack.util.StringUtils.requireNotNullNorEmpty;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -26,6 +24,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.util.MultiMap;
 import org.jivesoftware.smack.util.Objects;
@@ -34,7 +34,6 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.util.XmppDateTime;
-import org.jxmpp.util.XmppStringUtils;
 
 /**
  * This class describes an OpenPGP content element. It defines the elements and fields that OpenPGP content elements
@@ -50,7 +49,7 @@ public abstract class OpenPgpContentElement implements ExtensionElement {
 
     private final Set<? extends Jid> to;
     private final Date timestamp;
-    private final MultiMap<String, ExtensionElement> payload;
+    private final MultiMap<QName, ExtensionElement> payload;
 
     private String timestampString;
 
@@ -59,7 +58,7 @@ public abstract class OpenPgpContentElement implements ExtensionElement {
         this.timestamp = Objects.requireNonNull(timestamp);
         this.payload = new MultiMap<>();
         for (ExtensionElement e : payload) {
-            this.payload.put(XmppStringUtils.generateKey(e.getElementName(), e.getNamespace()), e);
+            this.payload.put(e.getQName(), e);
         }
     }
 
@@ -104,16 +103,14 @@ public abstract class OpenPgpContentElement implements ExtensionElement {
      * @return a set of all matching extensions.
      */
     public List<ExtensionElement> getExtensions(String elementName, String namespace) {
-        requireNotNullNorEmpty(elementName, "elementName must not be null or empty");
-        requireNotNullNorEmpty(namespace, "namespace must not be null or empty");
-        String key = XmppStringUtils.generateKey(elementName, namespace);
+        QName key = new QName(namespace, elementName);
         return payload.getAll(key);
     }
 
     /**
      * Returns the first extension of this stanza that has the given namespace.
      * <p>
-     * When possible, use {@link #getExtension(String,String)} instead.
+     * When possible, use {@link #getExtension(String, String)} instead.
      * </p>
      *
      * @param namespace the namespace of the extension that is desired.
@@ -139,7 +136,7 @@ public abstract class OpenPgpContentElement implements ExtensionElement {
         if (namespace == null) {
             return null;
         }
-        String key = XmppStringUtils.generateKey(elementName, namespace);
+        QName key = new QName(namespace, elementName);
         ExtensionElement packetExtension;
         synchronized (payload) {
             packetExtension = payload.getFirst(key);
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpElement.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpElement.java
index f661ed7bf..69d39ba6d 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpElement.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/element/OpenPgpElement.java
@@ -23,6 +23,7 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
+
 import org.jivesoftware.smackx.ox.util.Util;
 
 /**
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/CryptElementReceivedListener.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/CryptElementReceivedListener.java
index 21ea54817..9c1463ddd 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/CryptElementReceivedListener.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/CryptElementReceivedListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.ox.listener;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.element.CryptElement;
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SignElementReceivedListener.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SignElementReceivedListener.java
index 7b05a42aa..1bfd3a8fd 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SignElementReceivedListener.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SignElementReceivedListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.ox.listener;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.element.SignElement;
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SigncryptElementReceivedListener.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SigncryptElementReceivedListener.java
index a219ad52e..0e503e908 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SigncryptElementReceivedListener.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/listener/SigncryptElementReceivedListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.ox.listener;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.element.SigncryptElement;
 import org.jivesoftware.smackx.ox_im.OxMessageListener;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/CryptElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/CryptElementProvider.java
index c58aa34d4..2127b5771 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/CryptElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/CryptElementProvider.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
-import org.jivesoftware.smackx.ox.element.CryptElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.ox.element.CryptElement;
 
 /**
  * {@link org.jivesoftware.smack.provider.ExtensionElementProvider} implementation for the {@link CryptElement}.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java
index 630efda7b..57afcf76d 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpContentElementProvider.java
@@ -16,9 +16,6 @@
  */
 package org.jivesoftware.smackx.ox.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashSet;
@@ -35,6 +32,9 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.ox.element.CryptElement;
 import org.jivesoftware.smackx.ox.element.EncryptedOpenPgpContentElement;
 import org.jivesoftware.smackx.ox.element.OpenPgpContentElement;
@@ -43,8 +43,6 @@ import org.jivesoftware.smackx.ox.element.SigncryptElement;
 
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Abstract {@link ExtensionElementProvider} implementation for the also abstract {@link OpenPgpContentElement}.
@@ -90,10 +88,10 @@ public abstract class OpenPgpContentElementProvider<O extends OpenPgpContentElem
         List<ExtensionElement> payload = new LinkedList<>();
 
         outerloop: while (true) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
             switch (tag) {
-                case START_TAG:
+                case START_ELEMENT:
                     switch (name) {
 
                         case OpenPgpContentElement.ELEM_TIME:
@@ -112,12 +110,11 @@ public abstract class OpenPgpContentElementProvider<O extends OpenPgpContentElem
 
                         case OpenPgpContentElement.ELEM_PAYLOAD:
                             innerloop: while (true) {
-                                int ptag = parser.next();
+                                XmlPullParser.Event ptag = parser.next();
                                 String pname = parser.getName();
                                 String pns = parser.getNamespace();
                                 switch (ptag) {
-
-                                    case START_TAG:
+                                    case START_ELEMENT:
                                         ExtensionElementProvider<ExtensionElement> provider =
                                                 ProviderManager.getExtensionProvider(pname, pns);
                                         if (provider == null) {
@@ -127,15 +124,19 @@ public abstract class OpenPgpContentElementProvider<O extends OpenPgpContentElem
                                         payload.add(provider.parse(parser));
                                         break;
 
-                                    case END_TAG:
+                                    case END_ELEMENT:
                                         break innerloop;
+
+                                    default:
+                                        // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                                        break;
                                 }
                             }
                             break;
                     }
                     break;
 
-                case END_TAG:
+                case END_ELEMENT:
                     switch (name) {
                         case CryptElement.ELEMENT:
                         case SigncryptElement.ELEMENT:
@@ -143,6 +144,10 @@ public abstract class OpenPgpContentElementProvider<O extends OpenPgpContentElem
                             break outerloop;
                     }
                     break;
+
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpElementProvider.java
index d81be7976..5bd1e525b 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/OpenPgpElementProvider.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-import org.jivesoftware.smackx.ox.element.OpenPgpElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.ox.element.OpenPgpElement;
 
 /**
  * {@link ExtensionElementProvider} implementation for the {@link OpenPgpElement}.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PubkeyElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PubkeyElementProvider.java
index f8a33c38b..e3c2f9692 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PubkeyElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PubkeyElementProvider.java
@@ -16,8 +16,6 @@
  */
 package org.jivesoftware.smackx.ox.provider;
 
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Date;
@@ -26,10 +24,10 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
-import org.jivesoftware.smackx.ox.element.PubkeyElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.ox.element.PubkeyElement;
 
 /**
  * {@link ExtensionElementProvider} implementation for the {@link PubkeyElement}.
@@ -43,9 +41,9 @@ public class PubkeyElementProvider extends ExtensionElementProvider<PubkeyElemen
         String dateString = parser.getAttributeValue(null, PubkeyElement.ATTR_DATE);
         Date date = ParserUtils.getDateFromOptionalXep82String(dateString);
         while (true) {
-            int tag = parser.next();
+            XmlPullParser.Event tag = parser.next();
             String name = parser.getName();
-            if (tag == START_TAG) {
+            if (tag == XmlPullParser.Event.START_ELEMENT) {
                 switch (name) {
                     case PubkeyElement.PubkeyDataElement.ELEMENT:
                         String data = parser.nextText();
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PublicKeysListElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PublicKeysListElementProvider.java
index 3395bfb3a..5beb7be19 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PublicKeysListElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/PublicKeysListElementProvider.java
@@ -16,9 +16,6 @@
  */
 package org.jivesoftware.smackx.ox.provider;
 
-import static org.xmlpull.v1.XmlPullParser.END_TAG;
-import static org.xmlpull.v1.XmlPullParser.START_TAG;
-
 import java.io.IOException;
 import java.util.Date;
 
@@ -26,11 +23,12 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.util.ParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
 
 import org.pgpainless.key.OpenPgpV4Fingerprint;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public final class PublicKeysListElementProvider extends ExtensionElementProvider<PublicKeysListElement> {
 
@@ -43,12 +41,12 @@ public final class PublicKeysListElementProvider extends ExtensionElementProvide
 
         while (true) {
 
-            int tag = parser.nextTag();
-            String name = parser.getName();
+            XmlPullParser.TagEvent tag = parser.nextTag();
+            String name;
 
             switch (tag) {
-                case START_TAG:
-
+                case START_ELEMENT:
+                    name = parser.getName();
                     if (PublicKeysListElement.PubkeyMetadataElement.ELEMENT.equals(name)) {
                         String finger = parser.getAttributeValue(null,
                                 PublicKeysListElement.PubkeyMetadataElement.ATTR_V4_FINGERPRINT);
@@ -60,11 +58,16 @@ public final class PublicKeysListElementProvider extends ExtensionElementProvide
                     }
                     break;
 
-                case END_TAG:
-
+                case END_ELEMENT:
+                    name = parser.getName();
                     if (name.equals(PublicKeysListElement.ELEMENT)) {
                         return builder.build();
                     }
+                    break;
+
+                default:
+                    // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                    break;
             }
         }
     }
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SecretkeyElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SecretkeyElementProvider.java
index 138da4e3a..6f702131e 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SecretkeyElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SecretkeyElementProvider.java
@@ -21,10 +21,10 @@ import java.nio.charset.Charset;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
-import org.jivesoftware.smackx.ox.element.SecretkeyElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.ox.element.SecretkeyElement;
 
 /**
  * {@link ExtensionElementProvider} implementation for the {@link SecretkeyElement}.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SignElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SignElementProvider.java
index 8a0c6d5df..4f971af39 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SignElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SignElementProvider.java
@@ -22,10 +22,10 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smackx.ox.element.SignElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.ox.element.SignElement;
 
 /**
  * {@link org.jivesoftware.smack.provider.ExtensionElementProvider} implementation for the {@link SignElement}.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SigncryptElementProvider.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SigncryptElementProvider.java
index 3187e0473..74ebc9b88 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SigncryptElementProvider.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/provider/SigncryptElementProvider.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.parsing.SmackParsingException;
-import org.jivesoftware.smackx.ox.element.SigncryptElement;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smackx.ox.element.SigncryptElement;
 
 /**
  * {@link org.jivesoftware.smack.provider.ExtensionElementProvider} implementation for the {@link SigncryptElement}.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpStore.java
index 158ea7368..61f91cb7c 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/abstr/AbstractOpenPgpStore.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Observable;
 
 import org.jivesoftware.smack.util.Objects;
+
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.callback.SecretKeyPassphraseCallback;
 import org.jivesoftware.smackx.ox.exception.MissingUserIdOnKeyException;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpKeyStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpKeyStore.java
index 3935dd44a..6e8f69ea3 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpKeyStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpKeyStore.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.FileUtils;
 import org.jivesoftware.smack.util.Objects;
+
 import org.jivesoftware.smackx.ox.store.abstr.AbstractOpenPgpKeyStore;
 import org.jivesoftware.smackx.ox.store.definition.OpenPgpKeyStore;
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java
index 1a1655601..9d20e2cfa 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpMetadataStore.java
@@ -33,6 +33,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.FileUtils;
+
 import org.jivesoftware.smackx.ox.store.abstr.AbstractOpenPgpMetadataStore;
 import org.jivesoftware.smackx.ox.store.definition.OpenPgpMetadataStore;
 import org.jivesoftware.smackx.ox.util.Util;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
index e92c5153f..20bcfee39 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpStore.java
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.ox.store.filebased;
 import java.io.File;
 
 import org.jivesoftware.smack.util.Objects;
+
 import org.jivesoftware.smackx.ox.store.abstr.AbstractOpenPgpStore;
 import org.jivesoftware.smackx.ox.store.definition.OpenPgpStore;
 
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpTrustStore.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpTrustStore.java
index 38c56e95e..433cd8d95 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpTrustStore.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/store/filebased/FileBasedOpenPgpTrustStore.java
@@ -30,6 +30,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.util.CloseableUtil;
 import org.jivesoftware.smack.util.FileUtils;
+
 import org.jivesoftware.smackx.ox.store.abstr.AbstractOpenPgpTrustStore;
 import org.jivesoftware.smackx.ox.store.definition.OpenPgpTrustStore;
 import org.jivesoftware.smackx.ox.util.Util;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java
index 9880facf1..b19257ac6 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/OpenPgpPubSubUtil.java
@@ -29,6 +29,7 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.StanzaError;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.ox.OpenPgpManager;
 import org.jivesoftware.smackx.ox.element.PubkeyElement;
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/SecretKeyBackupHelper.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/SecretKeyBackupHelper.java
index 13fe39a59..577f0c686 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/SecretKeyBackupHelper.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/util/SecretKeyBackupHelper.java
@@ -18,10 +18,11 @@ package org.jivesoftware.smackx.ox.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.security.SecureRandom;
 import java.util.Set;
 
+import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.stringencoder.Base64;
+
 import org.jivesoftware.smackx.ox.crypto.OpenPgpProvider;
 import org.jivesoftware.smackx.ox.element.SecretkeyElement;
 import org.jivesoftware.smackx.ox.exception.InvalidBackupCodeException;
@@ -51,26 +52,7 @@ public class SecretKeyBackupHelper {
      * @return backup code
      */
     public static String generateBackupPassword() {
-        final String alphabet = "123456789ABCDEFGHIJKLMNPQRSTUVWXYZ";
-        final int len = alphabet.length();
-        SecureRandom random = new SecureRandom();
-        StringBuilder code = new StringBuilder(29);
-
-        // 6 blocks
-        for (int i = 0; i < 6; i++) {
-
-            // of 4 chars
-            for (int j = 0; j < 4; j++) {
-                char c = alphabet.charAt(random.nextInt(len));
-                code.append(c);
-            }
-
-            // dash after every block except the last one
-            if (i != 5) {
-                code.append('-');
-            }
-        }
-        return code.toString();
+        return StringUtils.secureOfflineAttackSafeRandomString();
     }
 
     /**
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManager.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManager.java
index 591ead494..987473648 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManager.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManager.java
@@ -31,6 +31,8 @@ import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.chat2.ChatManager;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
 import org.jivesoftware.smackx.hints.element.StoreHint;
@@ -48,7 +50,6 @@ import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.Jid;
 import org.pgpainless.decryption_verification.OpenPgpMetadata;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Entry point of Smacks API for XEP-0374: OpenPGP for XMPP: Instant Messaging.
diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OxMessageListener.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OxMessageListener.java
index 55dd9c2fd..42362979a 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OxMessageListener.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox_im/OxMessageListener.java
@@ -17,6 +17,7 @@
 package org.jivesoftware.smackx.ox_im;
 
 import org.jivesoftware.smack.packet.Message;
+
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.element.OpenPgpElement;
 import org.jivesoftware.smackx.ox.element.SigncryptElement;
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java
index 2db1c50de..2d8d55419 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpElementTest.java
@@ -18,7 +18,8 @@ package org.jivesoftware.smackx.ox;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,6 +33,9 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.ox.element.CryptElement;
 import org.jivesoftware.smackx.ox.element.OpenPgpElement;
 import org.jivesoftware.smackx.ox.element.SignElement;
@@ -39,12 +43,10 @@ import org.jivesoftware.smackx.ox.element.SigncryptElement;
 import org.jivesoftware.smackx.ox.provider.OpenPgpContentElementProvider;
 import org.jivesoftware.smackx.ox.provider.OpenPgpElementProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class OpenPgpElementTest extends SmackTestSuite {
 
@@ -70,7 +72,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
 
         OpenPgpElement element = new OpenPgpElement("BASE64_OPENPGP_MESSAGE");
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         OpenPgpElement parsed = OpenPgpElementProvider.TEST_INSTANCE.parse(parser);
@@ -102,7 +104,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
         payload.add(new Message.Body("en", "Hello World!"));
         SignElement element = new SignElement(recipients, testDate, payload);
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         SignElement parsed = (SignElement) OpenPgpContentElementProvider.parseOpenPgpContentElement(parser);
@@ -132,7 +134,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
                 testDate,
                 payload);
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         CryptElement parsed = (CryptElement) OpenPgpContentElementProvider.parseOpenPgpContentElement(parser);
@@ -162,7 +164,7 @@ public class OpenPgpElementTest extends SmackTestSuite {
                 "f0rm1l4n4-mT8y33j!Y%fRSrcd^ZE4Q7VDt1L%WEgR!kv",
                 testDate, payload);
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         SigncryptElement parsed = (SigncryptElement) OpenPgpContentElementProvider.parseOpenPgpContentElement(parser);
@@ -174,12 +176,13 @@ public class OpenPgpElementTest extends SmackTestSuite {
         assertEquals(payload.get(0), element.getExtension(Message.Body.ELEMENT, Message.Body.NAMESPACE));
     }
 
-    @Test(expected = XmlPullParserException.class)
+    @Test
     public void openPgpContentElementProvider_invalidElementTest() throws IOException, XmlPullParserException {
         String invalidElementXML = "<payload>" +
                 "<body xmlns='jabber:client' xml:lang='en'>This is a secret message.</body>" +
                 "</payload>";
-        OpenPgpContentElementProvider.parseOpenPgpContentElement(invalidElementXML);
+        assertThrows(XmlPullParserException.class, () ->
+        OpenPgpContentElementProvider.parseOpenPgpContentElement(invalidElementXML));
     }
 
 }
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpStoreTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpStoreTest.java
index efe7ca23f..6be88ac0f 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpStoreTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/OpenPgpStoreTest.java
@@ -21,6 +21,7 @@ import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,6 +38,7 @@ import java.util.Map;
 
 import org.jivesoftware.smack.test.util.FileTestUtil;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.ox.callback.SecretKeyPassphraseCallback;
 import org.jivesoftware.smackx.ox.exception.MissingUserIdOnKeyException;
 import org.jivesoftware.smackx.ox.store.definition.OpenPgpStore;
@@ -199,18 +201,20 @@ public class OpenPgpStoreTest extends SmackTestSuite {
         openPgpStoreInstance1.deleteSecretKeyRing(alice, fingerprint);
     }
 
-    @Test(expected = MissingUserIdOnKeyException.class)
+    @Test
     public void t04_key_wrongBareJidOnSecretKeyImportTest() throws PGPException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException, IOException, MissingUserIdOnKeyException {
         PGPSecretKeyRing secretKeys = openPgpStoreInstance1.generateKeyRing(alice).getSecretKeys();
 
-        openPgpStoreInstance1.importSecretKey(bob, secretKeys);
+        assertThrows(MissingUserIdOnKeyException.class, () ->
+        openPgpStoreInstance1.importSecretKey(bob, secretKeys));
     }
 
-    @Test(expected = MissingUserIdOnKeyException.class)
+    @Test
     public void t05_key_wrongBareJidOnPublicKeyImportTest() throws PGPException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException, IOException, MissingUserIdOnKeyException {
         PGPPublicKeyRing publicKeys = openPgpStoreInstance1.generateKeyRing(alice).getPublicKeys();
 
-        openPgpStoreInstance1.importPublicKey(bob, publicKeys);
+        assertThrows(MissingUserIdOnKeyException.class, () ->
+        openPgpStoreInstance1.importPublicKey(bob, publicKeys));
     }
 
     @Test
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java
index f7fdc7fd9..65c639971 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PainlessOpenPgpProviderTest.java
@@ -34,6 +34,8 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.FileTestUtil;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.ox.crypto.OpenPgpElementAndMetadata;
 import org.jivesoftware.smackx.ox.crypto.PainlessOpenPgpProvider;
 import org.jivesoftware.smackx.ox.element.CryptElement;
@@ -46,14 +48,13 @@ import org.jivesoftware.smackx.ox.store.filebased.FileBasedOpenPgpStore;
 import org.bouncycastle.openpgp.PGPException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.Jid;
 import org.jxmpp.jid.JidTestUtil;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 import org.pgpainless.key.collection.PGPKeyRing;
 import org.pgpainless.key.protection.UnprotectedKeysProtector;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class PainlessOpenPgpProviderTest extends SmackTestSuite {
 
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubSubDelegateTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubSubDelegateTest.java
index 9581abb41..3a42a8d28 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubSubDelegateTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubSubDelegateTest.java
@@ -19,10 +19,11 @@ package org.jivesoftware.smackx.ox;
 import static junit.framework.TestCase.assertEquals;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.ox.util.OpenPgpPubSubUtil;
 
 import org.bouncycastle.openpgp.PGPException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 
 public class PubSubDelegateTest extends SmackTestSuite {
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java
index 1d1bb6837..72b69941a 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PubkeyElementTest.java
@@ -18,7 +18,7 @@ package org.jivesoftware.smackx.ox;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -26,12 +26,13 @@ import java.util.Date;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.ox.element.PubkeyElement;
 import org.jivesoftware.smackx.ox.provider.PubkeyElementProvider;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.util.XmppDateTime;
-import org.xmlpull.v1.XmlPullParser;
 
 public class PubkeyElementTest extends SmackTestSuite {
 
@@ -48,7 +49,7 @@ public class PubkeyElementTest extends SmackTestSuite {
         byte[] key = "BASE64_OPENPGP_PUBLIC_KEY".getBytes(Charset.forName("UTF-8"));
         PubkeyElement element = new PubkeyElement(new PubkeyElement.PubkeyDataElement(key), date);
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         PubkeyElement parsed = PubkeyElementProvider.TEST_INSTANCE.parse(parser);
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java
index fc5364071..54f2f98cc 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/PublicKeysListElementTest.java
@@ -17,20 +17,21 @@
 package org.jivesoftware.smackx.ox;
 
 import static junit.framework.TestCase.assertEquals;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.util.Date;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.ox.element.PublicKeysListElement;
 import org.jivesoftware.smackx.ox.provider.PublicKeysListElementProvider;
 
 import org.bouncycastle.openpgp.PGPException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.util.XmppDateTime;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
-import org.xmlpull.v1.XmlPullParser;
 
 public class PublicKeysListElementTest extends SmackTestSuite {
 
@@ -62,7 +63,7 @@ public class PublicKeysListElementTest extends SmackTestSuite {
                 .addMetadata(child2)
                 .build();
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         PublicKeysListElement parsed = PublicKeysListElementProvider.TEST_INSTANCE.parse(parser);
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretKeyBackupHelperTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretKeyBackupHelperTest.java
index efc2b5712..92d8ad92e 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretKeyBackupHelperTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretKeyBackupHelperTest.java
@@ -30,6 +30,7 @@ import java.util.Collections;
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.test.util.FileTestUtil;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
+
 import org.jivesoftware.smackx.ox.crypto.PainlessOpenPgpProvider;
 import org.jivesoftware.smackx.ox.element.SecretkeyElement;
 import org.jivesoftware.smackx.ox.exception.InvalidBackupCodeException;
@@ -42,7 +43,7 @@ import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.BareJid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.pgpainless.PGPainless;
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java
index 5eddd9109..56902d75f 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox/SecretkeyElementTest.java
@@ -17,18 +17,19 @@
 package org.jivesoftware.smackx.ox;
 
 import static junit.framework.TestCase.assertTrue;
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
 
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+
 import org.jivesoftware.smackx.ox.element.SecretkeyElement;
 import org.jivesoftware.smackx.ox.provider.SecretkeyElementProvider;
 
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
+import org.junit.jupiter.api.Test;
 
 public class SecretkeyElementTest extends SmackTestSuite {
 
@@ -42,7 +43,7 @@ public class SecretkeyElementTest extends SmackTestSuite {
 
         SecretkeyElement element = new SecretkeyElement(key);
 
-        assertXMLEqual(expected, element.toXML().toString());
+        assertXmlSimilar(expected, element.toXML().toString());
 
         XmlPullParser parser = TestUtils.getParser(expected);
         SecretkeyElement parsed = SecretkeyElementProvider.TEST_INSTANCE.parse(parser);
diff --git a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java
index 28f09646c..d5f1571a4 100644
--- a/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java
+++ b/smack-openpgp/src/test/java/org/jivesoftware/smackx/ox_im/OXInstantMessagingManagerTest.java
@@ -37,6 +37,8 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.test.util.FileTestUtil;
 import org.jivesoftware.smack.test.util.SmackTestSuite;
 import org.jivesoftware.smack.util.StringUtils;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
 import org.jivesoftware.smackx.eme.element.ExplicitMessageEncryptionElement;
 import org.jivesoftware.smackx.ox.OpenPgpContact;
 import org.jivesoftware.smackx.ox.OpenPgpManager;
@@ -51,11 +53,10 @@ import org.jivesoftware.smackx.ox.store.filebased.FileBasedOpenPgpStore;
 import org.bouncycastle.openpgp.PGPException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.JidTestUtil;
 import org.pgpainless.decryption_verification.OpenPgpMetadata;
-import org.xmlpull.v1.XmlPullParserException;
 
 public class OXInstantMessagingManagerTest extends SmackTestSuite {
 
@@ -94,7 +95,6 @@ public class OXInstantMessagingManagerTest extends SmackTestSuite {
         bobOpenPgp.setOpenPgpProvider(bobProvider);
 
         OXInstantMessagingManager aliceOxim = OXInstantMessagingManager.getInstanceFor(aliceCon);
-        OXInstantMessagingManager bobOxim = OXInstantMessagingManager.getInstanceFor(bobCon);
 
         OpenPgpSelf aliceSelf = aliceOpenPgp.getOpenPgpSelf();
         OpenPgpSelf bobSelf = bobOpenPgp.getOpenPgpSelf();
diff --git a/smack-resolver-minidns-dox/src/test/java/org/jivesoftware/smackx/dox/resolver/minidns/DnsOverXmppMiniDnsResolverTest.java b/smack-resolver-minidns-dox/src/test/java/org/jivesoftware/smackx/dox/resolver/minidns/DnsOverXmppMiniDnsResolverTest.java
index e9d91f6ef..d98b2fdeb 100644
--- a/smack-resolver-minidns-dox/src/test/java/org/jivesoftware/smackx/dox/resolver/minidns/DnsOverXmppMiniDnsResolverTest.java
+++ b/smack-resolver-minidns-dox/src/test/java/org/jivesoftware/smackx/dox/resolver/minidns/DnsOverXmppMiniDnsResolverTest.java
@@ -16,15 +16,15 @@
  */
 package org.jivesoftware.smackx.dox.resolver.minidns;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.minidns.DnsCache;
 import org.minidns.DnsClient;
 import org.minidns.MiniDnsFuture;
diff --git a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java
index 76d3bf536..b0812ae7d 100644
--- a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java
+++ b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsDaneVerifier.java
@@ -19,7 +19,6 @@ package org.jivesoftware.smack.util.dns.minidns;
 import java.security.KeyManagementException;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
-import java.util.logging.Logger;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
@@ -33,7 +32,6 @@ import org.minidns.dane.DaneVerifier;
 import org.minidns.dane.ExpectingTrustManager;
 
 public class MiniDnsDaneVerifier implements SmackDaneVerifier {
-    private static final Logger LOGGER = Logger.getLogger(MiniDnsDaneVerifier.class.getName());
 
     private static final DaneVerifier VERIFIER = new DaneVerifier();
 
diff --git a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLGSSAPIMechanism.java b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLGSSAPIMechanism.java
index b82ac46a9..e7e145c37 100644
--- a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLGSSAPIMechanism.java
+++ b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLGSSAPIMechanism.java
@@ -30,8 +30,8 @@ public class SASLGSSAPIMechanism extends SASLJavaXMechanism {
     public static final String NAME = GSSAPI;
 
     static {
-        System.setProperty("javax.security.auth.useSubjectCredsOnly","false");
-        System.setProperty("java.security.auth.login.config","gss.conf");
+        System.setProperty("javax.security.auth.useSubjectCredsOnly", "false");
+        System.setProperty("java.security.auth.login.config", "gss.conf");
     }
 
     @Override
@@ -47,7 +47,7 @@ public class SASLGSSAPIMechanism extends SASLJavaXMechanism {
     @Override
     protected Map<String, String> getSaslProps() {
         Map<String, String> props = super.getSaslProps();
-        props.put(Sasl.SERVER_AUTH,"TRUE");
+        props.put(Sasl.SERVER_AUTH, "TRUE");
         return props;
     }
 
diff --git a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java
index e39447e04..00ac5a571 100644
--- a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java
+++ b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXMechanism.java
@@ -145,7 +145,7 @@ public abstract class SASLJavaXMechanism extends SASLMechanism {
         }
     }
 
-    protected Map<String,String> getSaslProps() {
+    protected Map<String, String> getSaslProps() {
         return new HashMap<>();
     }
 
diff --git a/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java b/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java
index 2fd6feaac..b0aa9c170 100644
--- a/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java
+++ b/smack-sasl-javax/src/test/java/org/jivesoftware/smack/sasl/javax/SASLDigestMD5Test.java
@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.sasl.DigestMd5SaslTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.stringprep.XmppStringprepException;
 
 public class SASLDigestMD5Test extends DigestMd5SaslTest {
diff --git a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java
index 97ff9c27c..4c5ba0ee2 100644
--- a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java
+++ b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Mechanism.java
@@ -16,7 +16,7 @@
  */
 package org.jivesoftware.smack.sasl.provided;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import javax.security.auth.callback.CallbackHandler;
 
@@ -103,13 +103,7 @@ public class SASLDigestMD5Mechanism extends SASLMechanism {
         if (challenge.length == 0) {
             throw new SmackSaslException("Initial challenge has zero length");
         }
-        String challengeString;
-        try {
-            challengeString = new String(challenge, StringUtils.UTF8);
-        }
-        catch (UnsupportedEncodingException e) {
-            throw new AssertionError(e);
-        }
+        String challengeString = new String(challenge, StandardCharsets.UTF_8);
         String[] challengeParts = challengeString.split(",");
         byte[] response = null;
         switch (state) {
diff --git a/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java b/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java
index 7933aff63..6ca64849b 100644
--- a/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java
+++ b/smack-sasl-provided/src/test/java/org/jivesoftware/smack/sasl/provided/SASLDigestMD5Test.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014 Florian Schmaus
+ * Copyright 2014-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.sasl.DigestMd5SaslTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.stringprep.XmppStringprepException;
 
 public class SASLDigestMD5Test extends DigestMd5SaslTest {
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/ParseStreamManagement.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/ParseStreamManagement.java
index eff90c7ea..747e1420e 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/ParseStreamManagement.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/ParseStreamManagement.java
@@ -29,9 +29,8 @@ import org.jivesoftware.smack.sm.packet.StreamManagement.Enabled;
 import org.jivesoftware.smack.sm.packet.StreamManagement.Failed;
 import org.jivesoftware.smack.sm.packet.StreamManagement.Resumed;
 import org.jivesoftware.smack.util.ParserUtils;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 public class ParseStreamManagement {
 
@@ -53,9 +52,9 @@ public class ParseStreamManagement {
         List<StanzaErrorTextElement> textElements = new ArrayList<>(4);
         outerloop:
         while (true) {
-            int event = parser.next();
+            XmlPullParser.Event event = parser.next();
             switch (event) {
-            case XmlPullParser.START_TAG:
+            case START_ELEMENT:
                 name = parser.getName();
                 String namespace = parser.getNamespace();
                 if (StanzaError.ERROR_CONDITION_AND_TEXT_NAMESPACE.equals(namespace)) {
@@ -69,12 +68,15 @@ public class ParseStreamManagement {
                     }
                 }
                 break;
-            case XmlPullParser.END_TAG:
+            case END_ELEMENT:
                 name = parser.getName();
                 if (Failed.ELEMENT.equals(name)) {
                     break outerloop;
                 }
                 break;
+            default:
+                // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                break;
             }
         }
         ParserUtils.assertAtEndTag(parser);
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/StreamManagementStreamFeatureProvider.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/StreamManagementStreamFeatureProvider.java
index 27ad71d1f..66f3349be 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/StreamManagementStreamFeatureProvider.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/StreamManagementStreamFeatureProvider.java
@@ -19,8 +19,7 @@ package org.jivesoftware.smack.sm.provider;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.sm.packet.StreamManagement.StreamManagementFeature;
-
-import org.xmlpull.v1.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
 
 public class StreamManagementStreamFeatureProvider extends ExtensionElementProvider<StreamManagementFeature> {
 
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index dd7b7a30a..8729be063 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -117,12 +117,14 @@ import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.TLSUtils;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jivesoftware.smack.util.dns.HostAddress;
+import org.jivesoftware.smack.xml.SmackXmlParser;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
 import org.jxmpp.stringprep.XmppStringprepException;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.minidns.dnsname.DnsName;
 
 /**
  * Creates a socket connection to an XMPP server. This is the default connection
@@ -160,9 +162,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      */
     protected final PacketReader packetReader = new PacketReader();
 
-    private final SynchronizationPoint<Exception> initialOpenStreamSend = new SynchronizationPoint<>(
-                    this, "initial open stream element send to server");
-
     /**
      *
      */
@@ -536,7 +535,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         compressSyncPoint.init();
         smResumedSyncPoint.init();
         smEnabledSyncPoint.init();
-        initialOpenStreamSend.init();
     }
 
     @Override
@@ -713,8 +711,31 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         final HostnameVerifier verifier = getConfiguration().getHostnameVerifier();
         if (verifier == null) {
                 throw new IllegalStateException("No HostnameVerifier set. Use connectionConfiguration.setHostnameVerifier() to configure.");
-        } else if (!verifier.verify(getXMPPServiceDomain().toString(), sslSocket.getSession())) {
-            throw new CertificateException("Hostname verification of certificate failed. Certificate does not authenticate " + getXMPPServiceDomain());
+        }
+
+        final String verifierHostname;
+        {
+            DnsName xmppServiceDomainDnsName = getConfiguration().getXmppServiceDomainAsDnsNameIfPossible();
+            // Try to convert the XMPP service domain, which potentially includes Unicode characters, into ASCII
+            // Compatible Encoding (ACE) to match RFC3280 dNSname IA5String constraint.
+            // See also: https://bugzilla.mozilla.org/show_bug.cgi?id=280839#c1
+            if (xmppServiceDomainDnsName != null) {
+                verifierHostname = xmppServiceDomainDnsName.ace;
+            }
+            else {
+                LOGGER.log(Level.WARNING, "XMPP service domain name '" + getXMPPServiceDomain()
+                                + "' can not be represented as DNS name. TLS X.509 certificate validiation may fail.");
+                verifierHostname = getXMPPServiceDomain().toString();
+            }
+        }
+
+        final boolean verificationSuccessful;
+        // Verify the TLS session.
+        verificationSuccessful = verifier.verify(verifierHostname, sslSocket.getSession());
+        if (!verificationSuccessful) {
+            throw new CertificateException(
+                            "Hostname verification of certificate failed. Certificate does not authenticate "
+                                            + getXMPPServiceDomain());
         }
 
         // Set that TLS was successful
@@ -855,7 +876,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
      */
     void openStream() throws SmackException, InterruptedException, XmlPullParserException {
         sendStreamOpen();
-        packetReader.parser = PacketParserUtils.newXmppParser(reader);
+        packetReader.parser = SmackXmlParser.newXmlParser(reader);
     }
 
     protected class PacketReader {
@@ -898,12 +919,14 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
          * Parse top-level packets in order to process them further.
          */
         private void parsePackets() {
+            boolean initialStreamOpenSend = false;
             try {
-                initialOpenStreamSend.checkIfSuccessOrWait();
-                int eventType = parser.getEventType();
+                openStream();
+                initialStreamOpenSend = true;
+                XmlPullParser.Event eventType = parser.getEventType();
                 while (!done) {
                     switch (eventType) {
-                    case XmlPullParser.START_TAG:
+                    case START_ELEMENT:
                         final String name = parser.getName();
                         switch (name) {
                         case Message.ELEMENT:
@@ -1071,7 +1094,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                              break;
                         }
                         break;
-                    case XmlPullParser.END_TAG:
+                    case END_ELEMENT:
                         final String endTagName = parser.getName();
                         if ("stream".equals(endTagName)) {
                             if (!parser.getNamespace().equals("http://etherx.jabber.org/streams")) {
@@ -1107,11 +1130,14 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                             }
                         }
                         break;
-                    case XmlPullParser.END_DOCUMENT:
+                    case END_DOCUMENT:
                         // END_DOCUMENT only happens in an error case, as otherwise we would see a
                         // closing stream element before.
                         throw new SmackException.SmackMessageException(
                                         "Parser got END_DOCUMENT event. This could happen e.g. if the server closed the connection without sending a closing stream element");
+                    default:
+                        // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+                        break;
                     }
                     eventType = parser.next();
                 }
@@ -1119,8 +1145,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
             catch (Exception e) {
                 closingStreamReceived.reportFailure(e);
                 // The exception can be ignored if the the connection is 'done'
-                // or if the it was caused because the socket got closed
-                if (!(done || packetWriter.queue.isShutdown())) {
+                // or if the it was caused because the socket got closed. It can not be ignored if it
+                // happened before (or while) the initial stream opened was send.
+                if (!(done || packetWriter.queue.isShutdown()) || !initialStreamOpenSend) {
                     // Close the connection and notify connection listeners of the
                     // error.
                     notifyConnectionError(e);
@@ -1275,8 +1302,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         private void writePackets() {
             Exception writerException = null;
             try {
-                openStream();
-                initialOpenStreamSend.reportSuccess();
                 // Write out packets from the queue.
                 while (!done()) {
                     Element element = nextStreamElement();
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
index 9fb6b71b2..aaccfacb6 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnectionConfiguration.java
@@ -69,7 +69,6 @@ public final class XMPPTCPConnectionConfiguration extends ConnectionConfiguratio
      * obtain a new instance and {@link #build} to build the configuration.
      */
     public static final class Builder extends ConnectionConfiguration.Builder<Builder, XMPPTCPConnectionConfiguration> {
-        private boolean compressionEnabled = false;
         private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
 
         private Builder() {
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java
index 8dcdd63fa..31b8f35a8 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XmppNioTcpConnection.java
@@ -91,6 +91,8 @@ import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smack.util.UTF8;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jivesoftware.smack.util.dns.HostAddress;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.Jid;
@@ -102,8 +104,6 @@ import org.jxmpp.xml.splitter.XmlPrettyPrinter;
 import org.jxmpp.xml.splitter.XmlPrinter;
 import org.jxmpp.xml.splitter.XmppElementCallback;
 import org.jxmpp.xml.splitter.XmppXmlSplitter;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * Represents and manages a client connection to an XMPP server via TCP.
@@ -1611,11 +1611,9 @@ public class XmppNioTcpConnection extends AbstractXmppNioConnection {
 
         @Override
         protected TransitionIntoResult transitionInto(WalkStateGraphContext walkStateGraphContext) {
-            boolean streamCloseIssued = false;
-
             closingStreamReceived.init();
 
-            streamCloseIssued = outgoingElementsQueue.offerAndShutdown(StreamClose.INSTANCE);
+            boolean streamCloseIssued = outgoingElementsQueue.offerAndShutdown(StreamClose.INSTANCE);
 
             afterOutgoingElementsQueueModified();
 
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java
index 59dcd0203..e984dd7f2 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014 Vyacheslav Blinov, 2017-2018 Florian Schmaus
+ * Copyright 2014 Vyacheslav Blinov, 2017-2019 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,9 @@
  */
 package org.jivesoftware.smack.sm.provider;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.List;
@@ -31,11 +28,11 @@ import org.jivesoftware.smack.packet.StanzaError;
 import org.jivesoftware.smack.packet.StanzaErrorTextElement;
 import org.jivesoftware.smack.sm.packet.StreamManagement;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import com.jamesmurty.utils.XMLBuilder;
-import org.junit.Test;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import org.junit.jupiter.api.Test;
 
 public class ParseStreamManagementTest {
     private static final Properties outputProperties = initOutputProperties();
@@ -58,11 +55,11 @@ public class ParseStreamManagementTest {
         StreamManagement.Enabled enabledPacket = ParseStreamManagement.enabled(
                 PacketParserUtils.getParserFor(enabledStanza));
 
-        assertThat(enabledPacket, is(notNullValue()));
-        assertThat(enabledPacket.getId(), equalTo(stanzaID));
-        assertThat(enabledPacket.getLocation(), equalTo(location));
-        assertThat(enabledPacket.isResumeSet(), equalTo(resume));
-        assertThat(enabledPacket.getMaxResumptionTime(), equalTo(max));
+        assertNotNull(enabledPacket);
+        assertEquals(enabledPacket.getId(), stanzaID);
+        assertEquals(location, enabledPacket.getLocation());
+        assertEquals(resume, enabledPacket.isResumeSet());
+        assertEquals(max, enabledPacket.getMaxResumptionTime());
     }
 
 
@@ -84,7 +81,7 @@ public class ParseStreamManagementTest {
         StreamManagement.Failed failedPacket = ParseStreamManagement.failed(
                 PacketParserUtils.getParserFor(failedStanza));
 
-        assertThat(failedPacket, is(notNullValue()));
+        assertNotNull(failedPacket);
         assertTrue(failedPacket.getStanzaErrorCondition() == null);
     }
 
@@ -100,7 +97,7 @@ public class ParseStreamManagementTest {
         StreamManagement.Failed failedPacket = ParseStreamManagement.failed(
                 PacketParserUtils.getParserFor(failedStanza));
 
-        assertThat(failedPacket, is(notNullValue()));
+        assertNotNull(failedPacket);
         assertTrue(failedPacket.getStanzaErrorCondition() == errorCondition);
     }
 
@@ -142,9 +139,9 @@ public class ParseStreamManagementTest {
         StreamManagement.Resumed resumedPacket = ParseStreamManagement.resumed(
                 PacketParserUtils.getParserFor(resumedStanza));
 
-        assertThat(resumedPacket, is(notNullValue()));
-        assertThat(resumedPacket.getHandledCount(), equalTo(handledPackets));
-        assertThat(resumedPacket.getPrevId(), equalTo(previousID));
+        assertNotNull(resumedPacket);
+        assertEquals(handledPackets, resumedPacket.getHandledCount());
+        assertEquals(previousID, resumedPacket.getPrevId());
     }
 
     @Test
@@ -159,8 +156,8 @@ public class ParseStreamManagementTest {
         StreamManagement.AckAnswer acknowledgementPacket = ParseStreamManagement.ackAnswer(
                 PacketParserUtils.getParserFor(ackStanza));
 
-        assertThat(acknowledgementPacket, is(notNullValue()));
-        assertThat(acknowledgementPacket.getHandledCount(), equalTo(handledPackets));
+        assertNotNull(acknowledgementPacket);
+        assertEquals(handledPackets, acknowledgementPacket.getHandledCount());
     }
 
     private static Properties initOutputProperties() {
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
index c28ec85e4..cb84f16e8 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
@@ -16,21 +16,32 @@
  */
 package org.jivesoftware.smack.tcp;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
 import java.io.Writer;
+import java.lang.reflect.Field;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReference;
 
+import org.jivesoftware.smack.AbstractXMPPConnection;
+import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection.PacketWriter;
+import org.jivesoftware.smack.util.ExceptionUtil;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jxmpp.stringprep.XmppStringprepException;
 
 public class PacketWriterTest {
+
+    private static final Reader DUMMY_READER = new StringReader("");
+
     private volatile boolean shutdown;
     private volatile boolean prematureUnblocked;
 
@@ -44,20 +55,37 @@ public class PacketWriterTest {
      * @throws BrokenBarrierException
      * @throws NotConnectedException
      * @throws XmppStringprepException
+     * @throws SecurityException
+     * @throws NoSuchFieldException
+     * @throws IllegalAccessException
+     * @throws IllegalArgumentException
      */
-    @SuppressWarnings("javadoc")
     @Test
-    public void shouldBlockAndUnblockTest() throws InterruptedException, BrokenBarrierException, NotConnectedException, XmppStringprepException {
+    public void shouldBlockAndUnblockTest() throws InterruptedException, BrokenBarrierException, NotConnectedException, XmppStringprepException, NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
         XMPPTCPConnection connection = new XMPPTCPConnection("user", "pass", "example.org");
+
+        // Get the protected "Reader reader" field from AbstractXMPPConnection and set it to a dummy Reader,
+        // as otherwise it will be null when we perform the writer threads init() which will make the StAX parser
+        // to throw an exception.
+        Field readerField = AbstractXMPPConnection.class.getDeclaredField("reader");
+        readerField.setAccessible(true);
+        readerField.set(connection, DUMMY_READER);
+
         final PacketWriter pw = connection.packetWriter;
-        connection.setWriter(new BlockingStringWriter());
+        BlockingStringWriter blockingStringWriter = new BlockingStringWriter();
+        connection.setWriter(blockingStringWriter);
         connection.packetWriter.init();
 
-        for (int i = 0; i < XMPPTCPConnection.PacketWriter.QUEUE_SIZE; i++) {
+        // Now insert QUEUE_SIZE + 1 stanzas into the outgoing queue to make sure that the queue is filled until its
+        // full capacity. The +1 is because the writer thread will dequeue one stanza and try to write it into the
+        // blocking writer.
+        for (int i = 0; i < XMPPTCPConnection.PacketWriter.QUEUE_SIZE + 1; i++) {
             pw.sendStreamElement(new Message());
         }
 
         final CyclicBarrier barrier = new CyclicBarrier(2);
+        final AtomicReference<Exception> unexpectedThreadExceptionReference = new AtomicReference<>();
+        final AtomicReference<Exception> expectedThreadExceptionReference = new AtomicReference<>();
         shutdown = false;
         prematureUnblocked = false;
         Thread t = new Thread(new Runnable() {
@@ -71,12 +99,20 @@ public class PacketWriterTest {
                         prematureUnblocked = true;
                     }
                 }
-                catch (Exception e) {
+                catch (InterruptedException | SmackException.NotConnectedException e) {
+                    // This is the exception we expect.
+                    expectedThreadExceptionReference.set(e);
                 }
+                catch (BrokenBarrierException e) {
+                    unexpectedThreadExceptionReference.set(e);
+
+                }
+
                 try {
                     barrier.await();
                 }
                 catch (InterruptedException | BrokenBarrierException e) {
+                    unexpectedThreadExceptionReference.set(e);
                 }
             }
         });
@@ -90,29 +126,58 @@ public class PacketWriterTest {
 
         // Set to true for testing purposes, so that shutdown() won't wait packet writer
         pw.shutdownDone.reportSuccess();
-        // Shutdown the packetwriter
+        // Shutdown the packetwriter, this will also interrupt the writer thread, which is what we hope to happen in the
+        // thread created above.
         pw.shutdown(false);
         shutdown = true;
         barrier.await();
-        if (prematureUnblocked) {
-            fail("Should not unblock before the thread got shutdown");
+
+        t.join(60000);
+
+        Exception unexpectedThreadException = unexpectedThreadExceptionReference.get();
+        try {
+            if (prematureUnblocked) {
+                String failureMessage = "Should not unblock before the thread got shutdown.";
+                if (unexpectedThreadException != null) {
+                    String stacktrace = ExceptionUtil.getStackTrace(unexpectedThreadException);
+                    failureMessage += " Unexpected thread exception thrown: " + unexpectedThreadException + "\n" + stacktrace;
+                }
+                fail(failureMessage);
+            }
+            else if (unexpectedThreadException != null) {
+                String stacktrace = ExceptionUtil.getStackTrace(unexpectedThreadException);
+                fail("Unexpected thread exception: " + unexpectedThreadException + "\n" + stacktrace);
+            }
+
+            assertNotNull(expectedThreadExceptionReference.get(), "Did not encounter expected exception on sendStreamElement()");
         }
-        synchronized (t) {
-            t.notify();
+        finally {
+            blockingStringWriter.unblock();
         }
     }
 
     public static class BlockingStringWriter extends Writer {
+        private boolean blocked = true;
+
         @Override
-        @SuppressWarnings("WaitNotInLoop")
         public void write(char[] cbuf, int off, int len) throws IOException {
-            try {
-                wait();
-            }
-            catch (InterruptedException e) {
+            synchronized (this) {
+                while (blocked) {
+                    try {
+                        wait();
+                    }
+                    catch (InterruptedException e) {
+                        throw new AssertionError(e);
+                    }
+                }
             }
         }
 
+        public synchronized void unblock() {
+            blocked = false;
+            notify();
+        }
+
         @Override
         public void flush() throws IOException {
         }
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/TcpInitializerTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/TcpInitializerTest.java
index 1b56187e6..478e4a691 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/TcpInitializerTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/TcpInitializerTest.java
@@ -16,11 +16,11 @@
  */
 package org.jivesoftware.smack.tcp;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TcpInitializerTest {
 
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java
index 14162b3e2..16c9989c5 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/XmppNioTcpConnectionTest.java
@@ -27,6 +27,7 @@ public class XmppNioTcpConnectionTest {
     }
 
     private static void assertContains(GraphVertex<StateDescriptor> graph, Class<? extends StateDescriptor> state) {
-        throw new Error("Implement me");
+        // TODO: Implement this.
+        throw new Error("Implement me: " + graph + " " + state);
     }
 }
diff --git a/smack-xmlparser-stax/build.gradle b/smack-xmlparser-stax/build.gradle
new file mode 100644
index 000000000..03c727630
--- /dev/null
+++ b/smack-xmlparser-stax/build.gradle
@@ -0,0 +1,7 @@
+description = """\
+Smack XML parser using Stax."""
+
+dependencies {
+	compile project(':smack-xmlparser')
+	testCompile project(path: ":smack-xmlparser", configuration: "testRuntime")
+}
diff --git a/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/StaxXmlPullParser.java b/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/StaxXmlPullParser.java
new file mode 100644
index 000000000..56542fc97
--- /dev/null
+++ b/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/StaxXmlPullParser.java
@@ -0,0 +1,301 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml.stax;
+
+import java.io.IOException;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+public final class StaxXmlPullParser implements XmlPullParser {
+
+    private final XMLStreamReader xmlStreamReader;
+
+    private int depth;
+
+    StaxXmlPullParser(XMLStreamReader xmlStreamReader) {
+        this.xmlStreamReader = xmlStreamReader;
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return xmlStreamReader.getProperty(name);
+    }
+
+    @Override
+    public String getInputEncoding() {
+        return xmlStreamReader.getEncoding();
+    }
+
+    @Override
+    public int getNamespaceCount() {
+        return xmlStreamReader.getNamespaceCount();
+    }
+
+    @Override
+    public String getNamespacePrefix(int pos) {
+        return xmlStreamReader.getNamespacePrefix(pos);
+    }
+
+    @Override
+    public String getNamespaceUri(int pos) {
+        return xmlStreamReader.getNamespaceURI(pos);
+    }
+
+    @Override
+    public String getNamespace(String prefix) {
+        if (prefix == null) {
+            prefix = XMLConstants.DEFAULT_NS_PREFIX;
+        }
+        NamespaceContext namespaceContext = xmlStreamReader.getNamespaceContext();
+        return namespaceContext.getNamespaceURI(prefix);
+    }
+
+    @Override
+    public int getDepth() {
+        return depth;
+    }
+
+    @Override
+    public String getPositionDescription() {
+        Location location = xmlStreamReader.getLocation();
+        return location.toString();
+    }
+
+    @Override
+    public int getLineNumber() {
+        Location location = xmlStreamReader.getLocation();
+        return location.getLineNumber();
+    }
+
+    @Override
+    public int getColumnNumber() {
+        Location location = xmlStreamReader.getLocation();
+        return location.getColumnNumber();
+    }
+
+    @Override
+    public boolean isWhiteSpace() {
+        return xmlStreamReader.isWhiteSpace();
+    }
+
+    @Override
+    public String getText() {
+        return xmlStreamReader.getText();
+    }
+
+    @Override
+    public String getNamespace() {
+        NamespaceContext namespaceContext = xmlStreamReader.getNamespaceContext();
+        String prefix = getPrefix();
+        return namespaceContext.getNamespaceURI(prefix);
+    }
+
+    @Override
+    public String getName() {
+        QName qname = getQName();
+        return qname.getLocalPart();
+    }
+
+    @Override
+    public QName getQName() {
+        return xmlStreamReader.getName();
+    }
+
+    @Override
+    public String getPrefix() {
+        return xmlStreamReader.getPrefix();
+    }
+
+    @Override
+    public int getAttributeCount() {
+        return xmlStreamReader.getAttributeCount();
+    }
+
+    @Override
+    public String getAttributeNamespace(int index) {
+        return xmlStreamReader.getAttributeNamespace(index);
+    }
+
+    @Override
+    public String getAttributeName(int index) {
+        QName qname = getAttributeQName(index);
+        if (qname == null) {
+            return null;
+        }
+        return qname.getLocalPart();
+    }
+
+    @Override
+    public QName getAttributeQName(int index) {
+        return xmlStreamReader.getAttributeName(index);
+    }
+
+    @Override
+    public String getAttributePrefix(int index) {
+        return xmlStreamReader.getAttributePrefix(index);
+    }
+
+    @Override
+    public String getAttributeType(int index) {
+        return xmlStreamReader.getAttributeType(index);
+    }
+
+    @Override
+    public String getAttributeValue(int index) {
+        return xmlStreamReader.getAttributeValue(index);
+    }
+
+    @Override
+    public String getAttributeValue(String namespace, String name) {
+        String namespaceURI = namespace;
+        String localName = name;
+        return xmlStreamReader.getAttributeValue(namespaceURI, localName);
+    }
+
+    @Override
+    public Event getEventType() {
+        int staxEventInt = xmlStreamReader.getEventType();
+        return staxEventIntegerToEvent(staxEventInt);
+    }
+
+    private boolean delayedDepthDecrement;
+
+    @Override
+    public Event next() throws XmlPullParserException {
+        preNextEvent();
+
+        int staxEventInt;
+        try {
+            staxEventInt = xmlStreamReader.next();
+        } catch (XMLStreamException e) {
+            throw new XmlPullParserException(e);
+        }
+
+        Event event = staxEventIntegerToEvent(staxEventInt);
+        switch (event) {
+        case START_ELEMENT:
+            depth++;
+            break;
+        case END_ELEMENT:
+            delayedDepthDecrement = true;
+            break;
+        default:
+            // Catch all for incomplete switch (MissingCasesInEnumSwitch) statement.
+            break;
+        }
+        return event;
+    }
+
+    @Override
+    public String nextText() throws IOException, XmlPullParserException {
+        final String nextText;
+        try {
+            nextText = xmlStreamReader.getElementText();
+        } catch (XMLStreamException e) {
+            throw new XmlPullParserException(e);
+        }
+
+        // XMLStreamReader.getElementText() will forward to the next END_ELEMENT, hence we need to set
+        // delayedDepthDecrement to true.
+        delayedDepthDecrement = true;
+
+        return nextText;
+    }
+
+    @Override
+    public TagEvent nextTag() throws IOException, XmlPullParserException {
+        preNextEvent();
+
+        int staxEventInt;
+        try {
+            staxEventInt = xmlStreamReader.nextTag();
+        } catch (XMLStreamException e) {
+            throw new XmlPullParserException(e);
+        }
+
+        switch (staxEventInt) {
+        case XMLStreamConstants.START_ELEMENT:
+            depth++;
+            return TagEvent.START_ELEMENT;
+        case XMLStreamConstants.END_ELEMENT:
+            delayedDepthDecrement = true;
+            return TagEvent.END_ELEMENT;
+        default:
+            throw new AssertionError();
+        }
+    }
+
+    private void preNextEvent() {
+        if (delayedDepthDecrement) {
+            depth--;
+            delayedDepthDecrement = false;
+            assert depth >= 0;
+        }
+    }
+
+    private static Event staxEventIntegerToEvent(int staxEventInt) {
+        switch (staxEventInt) {
+        case XMLStreamConstants.START_ELEMENT:
+            return Event.START_ELEMENT;
+        case XMLStreamConstants.END_ELEMENT:
+            return Event.END_ELEMENT;
+        case XMLStreamConstants.PROCESSING_INSTRUCTION:
+            return Event.PROCESSING_INSTRUCTION;
+        case XMLStreamConstants.CHARACTERS:
+            return Event.TEXT_CHARACTERS;
+        case XMLStreamConstants.COMMENT:
+            return Event.COMMENT;
+        case XMLStreamConstants.SPACE:
+            return Event.IGNORABLE_WHITESPACE;
+        case XMLStreamConstants.START_DOCUMENT:
+            return Event.START_DOCUMENT;
+        case XMLStreamConstants.END_DOCUMENT:
+            return Event.END_DOCUMENT;
+        case XMLStreamConstants.ENTITY_REFERENCE:
+            return Event.ENTITY_REFERENCE;
+        case XMLStreamConstants.ATTRIBUTE:
+            return Event.OTHER;
+        case XMLStreamConstants.DTD:
+            return Event.OTHER;
+        case XMLStreamConstants.CDATA:
+            return Event.OTHER;
+        case XMLStreamConstants.NAMESPACE:
+            return Event.OTHER;
+        case XMLStreamConstants.NOTATION_DECLARATION:
+            return Event.OTHER;
+        case XMLStreamConstants.ENTITY_DECLARATION:
+            return Event.OTHER;
+        default:
+            throw new IllegalArgumentException("Unknown Stax event integer: " + staxEventInt);
+        }
+    }
+
+    @Override
+    public boolean supportsRoundtrip() {
+        // TODO: Is there a StAX parser implementation which does support roundtrip?
+        return false;
+    }
+}
diff --git a/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/StaxXmlPullParserFactory.java b/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/StaxXmlPullParserFactory.java
new file mode 100644
index 000000000..1806bbbee
--- /dev/null
+++ b/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/StaxXmlPullParserFactory.java
@@ -0,0 +1,50 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml.stax;
+
+import java.io.Reader;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.jivesoftware.smack.xml.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParserFactory;
+
+public class StaxXmlPullParserFactory implements XmlPullParserFactory {
+
+    private static final XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory();
+
+    static {
+        // XPP3 appears to coalescing hence we need to configure our StAX parser to also return all available text on
+        // getText().
+        xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
+        // Internal and external entity references are prohibited in XMPP (RFC 6120 § 11.1).
+        xmlInputFactory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, false);
+    }
+
+    @Override
+    public StaxXmlPullParser newXmlPullParser(Reader reader) throws XmlPullParserException {
+        XMLStreamReader xmlStreamReader;
+        try {
+            xmlStreamReader = xmlInputFactory.createXMLStreamReader(reader);
+        } catch (XMLStreamException e) {
+            throw new XmlPullParserException(e);
+        }
+        return new StaxXmlPullParser(xmlStreamReader);
+    }
+}
diff --git a/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/package-info.java b/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/package-info.java
new file mode 100644
index 000000000..23131b25d
--- /dev/null
+++ b/smack-xmlparser-stax/src/main/java/org/jivesoftware/smack/xml/stax/package-info.java
@@ -0,0 +1,23 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Classes for XML handling using StAX (Streaming API for XML, JSR 173).
+ *
+ * @see <a href="https://docs.oracle.com/javase/tutorial/jaxp/stax/index.html">Streaming API for XML</a>
+ */
+package org.jivesoftware.smack.xml.stax;
diff --git a/smack-xmlparser-stax/src/main/resources/META-INF/services/org.jivesoftware.smack.xml.XmlPullParserFactory b/smack-xmlparser-stax/src/main/resources/META-INF/services/org.jivesoftware.smack.xml.XmlPullParserFactory
new file mode 100644
index 000000000..b61383e2b
--- /dev/null
+++ b/smack-xmlparser-stax/src/main/resources/META-INF/services/org.jivesoftware.smack.xml.XmlPullParserFactory
@@ -0,0 +1 @@
+org.jivesoftware.smack.xml.stax.StaxXmlPullParserFactory
diff --git a/smack-xmlparser-stax/src/test/java/org/jivesoftware/smack/xml/stax/StaxParserTest.java b/smack-xmlparser-stax/src/test/java/org/jivesoftware/smack/xml/stax/StaxParserTest.java
new file mode 100644
index 000000000..21cc355f2
--- /dev/null
+++ b/smack-xmlparser-stax/src/test/java/org/jivesoftware/smack/xml/stax/StaxParserTest.java
@@ -0,0 +1,36 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml.stax;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.junit.jupiter.api.Test;
+
+public class StaxParserTest {
+
+    @Test
+    public void factoryTest() throws XmlPullParserException, IOException {
+        StaxXmlPullParserFactory staxXmlPullParserFactory = new StaxXmlPullParserFactory();
+        XmlPullParser parser = staxXmlPullParserFactory.newXmlPullParser(new StringReader("<element/>"));
+        parser.next();
+    }
+
+}
diff --git a/smack-xmlparser-xpp3/build.gradle b/smack-xmlparser-xpp3/build.gradle
new file mode 100644
index 000000000..fb647f0bc
--- /dev/null
+++ b/smack-xmlparser-xpp3/build.gradle
@@ -0,0 +1,13 @@
+description = """\
+Smack XML parser using XPP3."""
+
+ext {
+	xpp3Version = "1.1.4c"
+}
+
+dependencies {
+	api "xpp3:xpp3_min:$xpp3Version"
+	implementation "xpp3:xpp3:$xpp3Version"
+	api project(':smack-xmlparser')
+	testCompile project(path: ":smack-xmlparser", configuration: "testRuntime")
+}
diff --git a/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/Xpp3XmlPullParser.java b/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/Xpp3XmlPullParser.java
new file mode 100644
index 000000000..a343276bf
--- /dev/null
+++ b/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/Xpp3XmlPullParser.java
@@ -0,0 +1,302 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml.xpp3;
+
+import java.io.IOException;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+public final class Xpp3XmlPullParser implements XmlPullParser {
+
+    private final org.xmlpull.v1.XmlPullParser xpp3XmlPullParser;
+
+    public Xpp3XmlPullParser(org.xmlpull.v1.XmlPullParser xpp3XmlPullParser) {
+        this.xpp3XmlPullParser = xpp3XmlPullParser;
+    }
+
+    @Override
+    public Object getProperty(String name) {
+        return xpp3XmlPullParser.getProperty(name);
+    }
+
+    @Override
+    public String getInputEncoding() {
+        return xpp3XmlPullParser.getInputEncoding();
+    }
+
+    @Override
+    public int getNamespaceCount() throws XmlPullParserException {
+        int depth = xpp3XmlPullParser.getDepth();
+        try {
+            return xpp3XmlPullParser.getNamespaceCount(depth);
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+    }
+
+    @Override
+    public String getNamespacePrefix(int pos) throws XmlPullParserException {
+        try {
+            return xpp3XmlPullParser.getNamespacePrefix(pos);
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+    }
+
+    @Override
+    public String getNamespaceUri(int pos) throws XmlPullParserException {
+        try {
+            return xpp3XmlPullParser.getNamespaceUri(pos);
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+    }
+
+    @Override
+    public String getNamespace(String prefix) {
+        return xpp3XmlPullParser.getNamespace(prefix);
+    }
+
+    @Override
+    public int getDepth() {
+        return xpp3XmlPullParser.getDepth();
+    }
+
+    @Override
+    public String getPositionDescription() {
+        return xpp3XmlPullParser.getPositionDescription();
+    }
+
+    @Override
+    public int getLineNumber() {
+        return xpp3XmlPullParser.getLineNumber();
+    }
+
+    @Override
+    public int getColumnNumber() {
+        return xpp3XmlPullParser.getColumnNumber();
+    }
+
+    @Override
+    public boolean isWhiteSpace() throws XmlPullParserException {
+        try {
+            return xpp3XmlPullParser.isWhitespace();
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+    }
+
+    @Override
+    public String getText() {
+        return xpp3XmlPullParser.getText();
+    }
+
+    @Override
+    public String getNamespace() {
+        return xpp3XmlPullParser.getNamespace();
+    }
+
+    @Override
+    public String getName() {
+        return xpp3XmlPullParser.getName();
+    }
+
+    @Override
+    public QName getQName() {
+        String localpart = xpp3XmlPullParser.getName();
+        String prefix = xpp3XmlPullParser.getPrefix();
+        prefix = nullValueToDefaultPrefix(prefix);
+        String namespace = xpp3XmlPullParser.getNamespace();
+
+        return new QName(namespace, localpart, prefix);
+    }
+
+    @Override
+    public String getPrefix() {
+        return xpp3XmlPullParser.getPrefix();
+    }
+
+    @Override
+    public int getAttributeCount() {
+        return xpp3XmlPullParser.getAttributeCount();
+    }
+
+    @Override
+    public String getAttributeNamespace(int index) {
+        String namespace;
+        try {
+            namespace = xpp3XmlPullParser.getAttributeNamespace(index);
+        }
+        catch (IndexOutOfBoundsException e) {
+            return null;
+        }
+
+        if (XMLConstants.NULL_NS_URI.equals(namespace)) {
+            namespace = null;
+        }
+        return namespace;
+    }
+
+    @Override
+    public String getAttributeName(int index) {
+        try {
+            return xpp3XmlPullParser.getAttributeName(index);
+        }
+        catch (IndexOutOfBoundsException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public QName getAttributeQName(int index) {
+        String localpart = getAttributeName(index);
+        if (localpart == null) {
+            return null;
+        }
+        String prefix = getAttributePrefix(index);
+        prefix = nullValueToDefaultPrefix(prefix);
+        String namespace = getAttributeNamespace(index);
+        return new QName(namespace, localpart, prefix);
+    }
+
+    @Override
+    public String getAttributePrefix(int index) {
+        String prefix;
+        try {
+            prefix = xpp3XmlPullParser.getAttributePrefix(index);
+        }
+        catch (IndexOutOfBoundsException e) {
+            return null;
+        }
+        prefix = nullValueToDefaultPrefix(prefix);
+        return prefix;
+    }
+
+    @Override
+    public String getAttributeType(int index) {
+        try {
+            return xpp3XmlPullParser.getAttributeType(index);
+        }
+        catch (IndexOutOfBoundsException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public String getAttributeValue(int index) {
+        return xpp3XmlPullParser.getAttributeValue(index);
+    }
+
+    @Override
+    public String getAttributeValue(String namespace, String name) {
+        return xpp3XmlPullParser.getAttributeValue(namespace, name);
+    }
+
+    @Override
+    public Event getEventType() throws XmlPullParserException {
+        int xpp3EventInt;
+        try {
+            xpp3EventInt = xpp3XmlPullParser.getEventType();
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+        return xpp3EventIntegerToEvent(xpp3EventInt);
+    }
+
+    @Override
+    public Event next() throws IOException, XmlPullParserException {
+        int xpp3EventInt;
+        try {
+            xpp3EventInt = xpp3XmlPullParser.next();
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+        return xpp3EventIntegerToEvent(xpp3EventInt);
+    }
+
+    @Override
+    public String nextText() throws IOException, XmlPullParserException {
+        try {
+            return xpp3XmlPullParser.nextText();
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+    }
+
+    @Override
+    public TagEvent nextTag() throws IOException, XmlPullParserException {
+        int xpp3EventInt;
+        try {
+            xpp3EventInt = xpp3XmlPullParser.nextTag();
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+        switch (xpp3EventInt) {
+        case org.xmlpull.v1.XmlPullParser.START_TAG:
+            return TagEvent.START_ELEMENT;
+        case org.xmlpull.v1.XmlPullParser.END_TAG:
+            return TagEvent.END_ELEMENT;
+        default:
+            throw new AssertionError();
+        }
+    }
+
+    @Override
+    public boolean supportsRoundtrip() {
+        return xpp3XmlPullParser.getFeature(Xpp3XmlPullParserFactory.FEATURE_XML_ROUNDTRIP);
+    }
+
+    private static Event xpp3EventIntegerToEvent(int xpp3EventInt) {
+        switch (xpp3EventInt) {
+        case org.xmlpull.v1.XmlPullParser.START_DOCUMENT:
+            return Event.START_DOCUMENT;
+        case org.xmlpull.v1.XmlPullParser.END_DOCUMENT:
+            return Event.END_DOCUMENT;
+        case org.xmlpull.v1.XmlPullParser.START_TAG:
+            return Event.START_ELEMENT;
+        case org.xmlpull.v1.XmlPullParser.END_TAG:
+            return Event.END_ELEMENT;
+        case org.xmlpull.v1.XmlPullParser.TEXT:
+            return Event.TEXT_CHARACTERS;
+        case org.xmlpull.v1.XmlPullParser.CDSECT:
+            return Event.OTHER;
+        case org.xmlpull.v1.XmlPullParser.ENTITY_REF:
+            return Event.ENTITY_REFERENCE;
+        case org.xmlpull.v1.XmlPullParser.IGNORABLE_WHITESPACE:
+            return Event.IGNORABLE_WHITESPACE;
+        case org.xmlpull.v1.XmlPullParser.PROCESSING_INSTRUCTION:
+            return Event.PROCESSING_INSTRUCTION;
+        case org.xmlpull.v1.XmlPullParser.COMMENT:
+            return Event.COMMENT;
+        case org.xmlpull.v1.XmlPullParser.DOCDECL:
+            return Event.OTHER;
+        default:
+            throw new IllegalArgumentException("Unknown XPP3 event integer: " + xpp3EventInt);
+        }
+    }
+
+    private static String nullValueToDefaultPrefix(String prefix) {
+        if (prefix != null) {
+            return prefix;
+        }
+        return XMLConstants.DEFAULT_NS_PREFIX;
+    }
+}
diff --git a/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/Xpp3XmlPullParserFactory.java b/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/Xpp3XmlPullParserFactory.java
new file mode 100644
index 000000000..b3f413593
--- /dev/null
+++ b/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/Xpp3XmlPullParserFactory.java
@@ -0,0 +1,86 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml.xpp3;
+
+import java.io.Reader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.jivesoftware.smack.xml.XmlPullParserException;
+import org.jivesoftware.smack.xml.XmlPullParserFactory;
+
+public class Xpp3XmlPullParserFactory implements XmlPullParserFactory {
+
+    private static final Logger LOGGER = Logger.getLogger(Xpp3XmlPullParserFactory.class.getName());
+
+    private static final org.xmlpull.v1.XmlPullParserFactory XPP3_XML_PULL_PARSER_FACTORY;
+
+    public static final String FEATURE_XML_ROUNDTRIP = "http://xmlpull.org/v1/doc/features.html#xml-roundtrip";
+
+    /**
+     * True if the XmlPullParser supports the XML_ROUNDTRIP feature.
+     */
+    public static final boolean XML_PULL_PARSER_SUPPORTS_ROUNDTRIP;
+
+    static {
+        org.xmlpull.v1.XmlPullParser xmlPullParser;
+        boolean roundtrip = false;
+        try {
+            XPP3_XML_PULL_PARSER_FACTORY = org.xmlpull.v1.XmlPullParserFactory.newInstance();
+            xmlPullParser = XPP3_XML_PULL_PARSER_FACTORY.newPullParser();
+            try {
+                xmlPullParser.setFeature(FEATURE_XML_ROUNDTRIP, true);
+                // We could successfully set the feature
+                roundtrip = true;
+            } catch (org.xmlpull.v1.XmlPullParserException e) {
+                // Doesn't matter if FEATURE_XML_ROUNDTRIP isn't available
+                LOGGER.log(Level.FINEST, "XmlPullParser does not support XML_ROUNDTRIP", e);
+            }
+        }
+        catch (org.xmlpull.v1.XmlPullParserException e) {
+            // Something really bad happened
+            throw new AssertionError(e);
+        }
+        XML_PULL_PARSER_SUPPORTS_ROUNDTRIP = roundtrip;
+    }
+
+    @Override
+    public Xpp3XmlPullParser newXmlPullParser(Reader reader) throws XmlPullParserException {
+        org.xmlpull.v1.XmlPullParser xpp3XmlPullParser;
+        try {
+            xpp3XmlPullParser = XPP3_XML_PULL_PARSER_FACTORY.newPullParser();
+            xpp3XmlPullParser.setFeature(org.xmlpull.v1.XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
+            xpp3XmlPullParser.setInput(reader);
+        } catch (org.xmlpull.v1.XmlPullParserException e) {
+            throw new XmlPullParserException(e);
+        }
+
+        if (XML_PULL_PARSER_SUPPORTS_ROUNDTRIP) {
+            try {
+                xpp3XmlPullParser.setFeature(FEATURE_XML_ROUNDTRIP, true);
+            }
+            catch (org.xmlpull.v1.XmlPullParserException e) {
+                LOGGER.log(Level.SEVERE,
+                                "XmlPullParser does not support XML_ROUNDTRIP, although it was first determined to be supported",
+                                e);
+            }
+        }
+
+        return new Xpp3XmlPullParser(xpp3XmlPullParser);
+    }
+
+}
diff --git a/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/package-info.java b/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/package-info.java
new file mode 100644
index 000000000..afed2224b
--- /dev/null
+++ b/smack-xmlparser-xpp3/src/main/java/org/jivesoftware/smack/xml/xpp3/package-info.java
@@ -0,0 +1,23 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Classes for XML handling using XPP3 (XML Pull Parser 3).
+ *
+ * @see <a href="https://www.extreme.indiana.edu/xgws/xsoap/xpp/">XML Pull Parser</a>
+ */
+package org.jivesoftware.smack.xml.xpp3;
diff --git a/smack-xmlparser-xpp3/src/main/resources/META-INF/services/org.jivesoftware.smack.xml.XmlPullParserFactory b/smack-xmlparser-xpp3/src/main/resources/META-INF/services/org.jivesoftware.smack.xml.XmlPullParserFactory
new file mode 100644
index 000000000..899ae3288
--- /dev/null
+++ b/smack-xmlparser-xpp3/src/main/resources/META-INF/services/org.jivesoftware.smack.xml.XmlPullParserFactory
@@ -0,0 +1 @@
+org.jivesoftware.smack.xml.xpp3.Xpp3XmlPullParserFactory
diff --git a/smack-xmlparser-xpp3/src/test/java/org/jivesoftware/smack/xml/xpp3/Xpp3ParserTest.java b/smack-xmlparser-xpp3/src/test/java/org/jivesoftware/smack/xml/xpp3/Xpp3ParserTest.java
new file mode 100644
index 000000000..ceb750467
--- /dev/null
+++ b/smack-xmlparser-xpp3/src/test/java/org/jivesoftware/smack/xml/xpp3/Xpp3ParserTest.java
@@ -0,0 +1,36 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml.xpp3;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import org.junit.jupiter.api.Test;
+
+public class Xpp3ParserTest {
+
+    @Test
+    public void factoryTest() throws XmlPullParserException, IOException {
+        Xpp3XmlPullParserFactory xpp3XmlPullParserFactory = new Xpp3XmlPullParserFactory();
+        XmlPullParser parser = xpp3XmlPullParserFactory.newXmlPullParser(new StringReader("<element/>"));
+        parser.next();
+    }
+
+}
diff --git a/smack-xmlparser/build.gradle b/smack-xmlparser/build.gradle
new file mode 100644
index 000000000..46318a504
--- /dev/null
+++ b/smack-xmlparser/build.gradle
@@ -0,0 +1,2 @@
+description = """\
+Smack XML parser fundamentals"""
diff --git a/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/SmackXmlParser.java b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/SmackXmlParser.java
new file mode 100644
index 000000000..16f61e732
--- /dev/null
+++ b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/SmackXmlParser.java
@@ -0,0 +1,57 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml;
+
+import java.io.Reader;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+public class SmackXmlParser {
+
+    private static final ServiceLoader<XmlPullParserFactory> xmlPullParserFactoryServiceLoader;
+
+    static {
+        xmlPullParserFactoryServiceLoader = ServiceLoader.load(XmlPullParserFactory.class);
+    }
+
+    public static XmlPullParserFactory getXmlPullParserFactory() {
+        Iterator<XmlPullParserFactory> iterator = xmlPullParserFactoryServiceLoader.iterator();
+        if (!iterator.hasNext()) {
+            throw new IllegalStateException("Could not load a XmlPullParserFactory via Service Provider Interface (SPI)");
+        }
+        return iterator.next();
+    }
+
+    /**
+     * Creates a new XmlPullParser suitable for parsing XMPP. This means in particular that
+     * FEATURE_PROCESS_NAMESPACES is enabled.
+     * <p>
+     * Note that not all XmlPullParser implementations will return a String on
+     * <code>getText()</code> if the parser is on START_ELEMENT or END_ELEMENT. So you must not rely on this
+     * behavior when using the parser.
+     * </p>
+     *
+     * @param reader a reader to read the XML data from.
+     * @return A suitable XmlPullParser for XMPP parsing.
+     * @throws XmlPullParserException in case of an XmlPullParserException.
+     */
+    public static XmlPullParser newXmlParser(Reader reader) throws XmlPullParserException {
+        XmlPullParserFactory xmlPullParserFactory = getXmlPullParserFactory();
+        return xmlPullParserFactory.newXmlPullParser(reader);
+    }
+
+}
diff --git a/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParser.java b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParser.java
new file mode 100644
index 000000000..cfc208751
--- /dev/null
+++ b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParser.java
@@ -0,0 +1,173 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml;
+
+import java.io.IOException;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Smack's interface for XML pull parsers. The main XML parser implementations are "Xml Pull Parser 3" (XPP3) on Android and "Streaming API for XML" (StAX, JSR 173) on Java.
+ *
+ * <p>
+ * Differences from StAX's XMLStreamReader are:
+ * </p>
+ * <ul>
+ *  <li>{@link #getName()} and {@link #getAttributeName(int)} return localname, there is {@link #getQName()} and {@link #getAttributeQName(int)} to retrieve the qualified name ({@link javax.xml.namespace.QName QName}).</li>
+ *  <li>{@link #nextText()} instead of {@code XMLStreamReader.getElementText()}.
+ * </ul>
+ * <p>
+ * Differences from XPP3's XmlPullParser are:
+ * </p>
+ * <ul>
+ *  <li>Methods taking an attribute, like {@link #getAttributeName(int)} index return <code>null</code> instead of throwing an exception if no attribute with the given index exists.</li>
+ * </ul>
+ *
+ * <h2>Developer Information</h2>
+ * <p>
+ * The following table shows the mapping of Smack's XmlPullParser events to StAX and XPP3 events:
+ * </p>
+ * <table summary="XmlPullParser event mapping">
+ * <tr><th>Smack's {@link XmlPullParser.Event}</th><th>StAX Event</th><th>XPP3 Event</th></tr>
+ * <tr><td>{@link XmlPullParser.Event#START_DOCUMENT}</td><td>START_DOCUMENT (7)</td><td>START_DOCUMENT (0)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#END_DOCUMENT}</td><td>END_DOCUMENT (8)</td><td>END_DOCUMENT (1)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#START_ELEMENT}</td><td>START_ELEMENT (1)</td><td>START_TAG (2)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#END_ELEMENT}</td><td>END_ELEMENT (2)</td><td>END_TAG (3)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#TEXT_CHARACTERS}</td><td>CHARACTERS (4)</td><td>TEXT (4)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#PROCESSING_INSTRUCTION}</td><td>PROCESSING_INSTRUCTION (3)</td><td>PROCESSING_INSTRUCTION (8)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#COMMENT}</td><td>COMMENT (5)</td><td>COMMENT (9)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#IGNORABLE_WHITESPACE}</td><td>SPACE (6)</td><td>IGNORABLE_WHITESPACE (7)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#ENTITY_REFERENCE}</td><td>ENTITY_REFERENCE (9)</td><td>ENTITY_REF (6)</td></tr>
+ * <tr><td>{@link XmlPullParser.Event#OTHER}</td><td>ENTITY_REFERENCE (9)</td><td>ENTITY_REF (6)</td></tr>
+ * </table>
+ * <p>{@link XmlPullParser.Event#OTHER} includes
+ * in case of StAX: ATTRIBUTE (10), DTD (11), CDATA (12), NAMESPACE (13), NOTATION_DECLARATION (14) and ENTITY_DECLRATION (15),
+ * in case of XPP3: CDSECT (5), DOCDECL (10).
+ * </p>
+ *
+ */
+public interface XmlPullParser {
+
+    Object getProperty(String name);
+
+    String getInputEncoding();
+
+    int getNamespaceCount() throws XmlPullParserException;
+
+    String getNamespacePrefix(int pos) throws XmlPullParserException;
+
+    String getNamespaceUri(int pos) throws XmlPullParserException;
+
+    String getNamespace(String prefix);
+
+    int getDepth();
+
+    String getPositionDescription();
+
+    int getLineNumber();
+
+    int getColumnNumber();
+
+    boolean isWhiteSpace() throws XmlPullParserException;
+
+    String getText();
+
+    String getNamespace();
+
+    /**
+     * Return the name for the current START_ELEMENT or END_ELEMENT event. This method must only be called if the
+     * current event is START_ELEMENT or END_ELEMENT.
+     *
+     * @return the name for the current START_ELEMETN or END_ELEMENT event.
+     */
+    String getName();
+
+    QName getQName();
+
+    String getPrefix();
+
+    int getAttributeCount();
+
+    String getAttributeNamespace(int index);
+
+    /**
+     * Returns the loacalpart of the attribute's name or <code>null</code> in case the index does not refer to an
+     * attribute.
+     *
+     * @param index the attribute index.
+     * @return the localpart of the attribute's name or <code>null</code>.
+     */
+    String getAttributeName(int index);
+
+    QName getAttributeQName(int index);
+
+    String getAttributePrefix(int index);
+
+    String getAttributeType(int index);
+
+    String getAttributeValue(int index);
+
+    String getAttributeValue(String namespace, String name);
+
+    default String getAttributeValue(String name) {
+        return getAttributeValue(null, name);
+    }
+
+    Event getEventType() throws XmlPullParserException;
+
+    Event next() throws IOException, XmlPullParserException;
+
+    /**
+     * Reads the content of a text-only element, an exception is thrown if this is
+     * not a text-only element.
+     * <ul>
+     * <li>Precondition: the current event is START_ELEMENT.</li>
+     * <li>Postcondition: the current event is the corresponding END_ELEMENT.</li>
+     * </ul>
+     *
+     * @return the textual content of the current element.
+     * @throws IOException in case of an IO error.
+     * @throws XmlPullParserException in case of an XML pull parser error.
+     */
+    String nextText() throws IOException, XmlPullParserException;
+
+    TagEvent nextTag() throws IOException, XmlPullParserException;
+
+    enum TagEvent {
+        START_ELEMENT,
+        END_ELEMENT,
+    }
+
+    enum Event {
+        START_DOCUMENT,
+        END_DOCUMENT,
+        START_ELEMENT,
+        END_ELEMENT,
+
+        /**
+         * Replaces TEXT from XPP3.
+         */
+        TEXT_CHARACTERS,
+        PROCESSING_INSTRUCTION,
+        COMMENT,
+        IGNORABLE_WHITESPACE,
+        ENTITY_REFERENCE,
+        OTHER,
+    }
+
+    boolean supportsRoundtrip();
+}
diff --git a/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParserException.java b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParserException.java
new file mode 100644
index 000000000..66cc7d5ac
--- /dev/null
+++ b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParserException.java
@@ -0,0 +1,30 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml;
+
+public class XmlPullParserException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public XmlPullParserException(Exception wrapped) {
+        super(wrapped);
+    }
+
+    public XmlPullParserException(String message) {
+        super(message);
+    }
+}
diff --git a/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParserFactory.java b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParserFactory.java
new file mode 100644
index 000000000..42877584e
--- /dev/null
+++ b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/XmlPullParserFactory.java
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml;
+
+import java.io.Reader;
+
+public interface XmlPullParserFactory {
+
+    XmlPullParser newXmlPullParser(Reader reader) throws XmlPullParserException;
+
+}
diff --git a/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/package-info.java b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/package-info.java
new file mode 100644
index 000000000..434d2829c
--- /dev/null
+++ b/smack-xmlparser/src/main/java/org/jivesoftware/smack/xml/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Classes for XML handling. Especially tailored for XMPP.
+ */
+package org.jivesoftware.smack.xml;
diff --git a/smack-xmlparser/src/test/java/org/jivesoftware/smack/xml/SmackXmlParserTest.java b/smack-xmlparser/src/test/java/org/jivesoftware/smack/xml/SmackXmlParserTest.java
new file mode 100644
index 000000000..80793900e
--- /dev/null
+++ b/smack-xmlparser/src/test/java/org/jivesoftware/smack/xml/SmackXmlParserTest.java
@@ -0,0 +1,29 @@
+/**
+ *
+ * Copyright 2019 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smack.xml;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class SmackXmlParserTest {
+
+    @Test
+    public void testSmackXmlParser() {
+        assertThrows(IllegalStateException.class, () -> SmackXmlParser.getXmlPullParserFactory());
+    }
+}