diff --git a/build/build/versions.txt b/build/build/versions.txt
index 94a789a3f..bc224b8b3 100644
--- a/build/build/versions.txt
+++ b/build/build/versions.txt
@@ -1,5 +1,5 @@
 jar		| version
 ----------------------------------------
-xmlunit		| 1.1beta1
+xmlunit		| 1.2
 jstun		| 0.7.2
-xpp         | 1.1.4c
\ No newline at end of file
+xpp		| 1.1.4c
diff --git a/build/build/xmlunit.jar b/build/build/xmlunit.jar
index 3bc3e8858..e61df62b8 100644
Binary files a/build/build/xmlunit.jar and b/build/build/xmlunit.jar differ
diff --git a/test-unit/org/jivesoftware/smack/packet/MessageTest.java b/test-unit/org/jivesoftware/smack/packet/MessageTest.java
index 7292560eb..fd79aad0d 100644
--- a/test-unit/org/jivesoftware/smack/packet/MessageTest.java
+++ b/test-unit/org/jivesoftware/smack/packet/MessageTest.java
@@ -8,21 +8,23 @@
 package org.jivesoftware.smack.packet;
 
 import static org.custommonkey.xmlunit.XMLAssert.*;
-import org.xml.sax.SAXException;
 import org.junit.Test;
+import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.ArrayList;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  *
  */
 public class MessageTest {
 
     @Test
-    public void setMessageTypeTest() throws IOException, SAXException {
+    public void setMessageTypeTest() throws IOException, SAXException, ParserConfigurationException {
         Message.Type type = Message.Type.chat;
         Message.Type type2 = Message.Type.headline;
 
@@ -66,7 +68,7 @@ public class MessageTest {
     }
 
     @Test
-    public void setMessageSubjectTest() throws IOException, SAXException {
+    public void setMessageSubjectTest() throws IOException, SAXException, ParserConfigurationException {
         final String messageSubject = "This is a test of the emergency broadcast system.";
 
         StringBuilder controlBuilder = new StringBuilder();
@@ -85,7 +87,7 @@ public class MessageTest {
     }
 
     @Test
-    public void oneMessageBodyTest() throws IOException, SAXException {
+    public void oneMessageBodyTest() throws IOException, SAXException, ParserConfigurationException {
         final String messageBody = "This is a test of the emergency broadcast system.";
 
         StringBuilder controlBuilder = new StringBuilder();
@@ -104,7 +106,7 @@ public class MessageTest {
     }
 
     @Test
-    public void multipleMessageBodiesTest() throws IOException, SAXException {
+    public void multipleMessageBodiesTest() throws IOException, SAXException, ParserConfigurationException {
         final String messageBody1 = "This is a test of the emergency broadcast system, 1.";
         final String lang2 = "ru";
         final String messageBody2 = "This is a test of the emergency broadcast system, 2.";
@@ -162,7 +164,7 @@ public class MessageTest {
     }
 
     @Test
-    public void setMessageThreadTest() throws IOException, SAXException {
+    public void setMessageThreadTest() throws IOException, SAXException, ParserConfigurationException {
         final String messageThread = "1234";
 
         StringBuilder controlBuilder = new StringBuilder();
@@ -181,7 +183,7 @@ public class MessageTest {
     }
 
     @Test
-    public void messageXmlLangTest() throws IOException, SAXException {
+    public void messageXmlLangTest() throws IOException, SAXException, ParserConfigurationException {
         final String lang = "sp";
 
         StringBuilder controlBuilder = new StringBuilder();
diff --git a/test-unit/org/jivesoftware/smack/packet/PresenceTest.java b/test-unit/org/jivesoftware/smack/packet/PresenceTest.java
index 5b3c0499e..56987dbe2 100644
--- a/test-unit/org/jivesoftware/smack/packet/PresenceTest.java
+++ b/test-unit/org/jivesoftware/smack/packet/PresenceTest.java
@@ -15,12 +15,14 @@ import static junit.framework.Assert.assertEquals;
 
 import java.io.IOException;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 /**
  *
  */
 public class PresenceTest {
     @Test
-    public void setPresenceTypeTest() throws IOException, SAXException {
+    public void setPresenceTypeTest() throws IOException, SAXException, ParserConfigurationException {
         Presence.Type type = Presence.Type.unavailable;
         Presence.Type type2 = Presence.Type.subscribe;
 
@@ -67,7 +69,7 @@ public class PresenceTest {
     }
 
     @Test
-    public void setPresenceStatusTest() throws IOException, SAXException {
+    public void setPresenceStatusTest() throws IOException, SAXException, ParserConfigurationException {
         final String status = "This is a test of the emergency broadcast system.";
 
         StringBuilder controlBuilder = new StringBuilder();
@@ -86,7 +88,7 @@ public class PresenceTest {
     }
 
     @Test
-    public void setPresencePriorityTest() throws IOException, SAXException {
+    public void setPresencePriorityTest() throws IOException, SAXException, ParserConfigurationException {
         final int priority = 10;
 
         StringBuilder controlBuilder = new StringBuilder();
@@ -110,7 +112,7 @@ public class PresenceTest {
     }
 
     @Test
-    public void setPresenceModeTest() throws IOException, SAXException {
+    public void setPresenceModeTest() throws IOException, SAXException, ParserConfigurationException {
         Presence.Mode mode1 = Presence.Mode.dnd;
                 final int priority = 10;
         final String status = "This is a test of the emergency broadcast system.";
@@ -161,7 +163,7 @@ public class PresenceTest {
     }
 
     @Test
-    public void presenceXmlLangTest() throws IOException, SAXException {
+    public void presenceXmlLangTest() throws IOException, SAXException, ParserConfigurationException {
         final String lang = "sp";
 
         StringBuilder controlBuilder = new StringBuilder();