diff --git a/core/src/main/java/org/jivesoftware/smack/ChatManager.java b/core/src/main/java/org/jivesoftware/smack/ChatManager.java
index 991e965b8..6d598b8ac 100644
--- a/core/src/main/java/org/jivesoftware/smack/ChatManager.java
+++ b/core/src/main/java/org/jivesoftware/smack/ChatManager.java
@@ -43,17 +43,17 @@ import org.jivesoftware.smack.util.collections.ReferenceMap;
  * @author Alexander Wenckus
  */
 public class ChatManager {
-    /*
+    /**
      * Sets the default behaviour for allowing 'normal' messages to be used in chats. As some clients don't set
      * the message type to chat, the type normal has to be accepted to allow chats with these clients.
      */
     private static boolean defaultIsNormalInclude = true;
-    
-    /*
+
+    /**
      * Sets the default behaviour for how to match chats when there is NO thread id in the incoming message.
      */
     private static MatchMode defaultMatchMode = MatchMode.BARE_JID;
-    
+
     /**
      * Defines the different modes under which a match will be attempted with an existing chat when
      * the incoming message does not have a thread id.
@@ -74,16 +74,16 @@ public class ChatManager {
         BARE_JID; 
     }
     
-    /*
+    /**
      * Determines whether incoming messages of type normal can create chats. 
      */
     private boolean normalIncluded = defaultIsNormalInclude;
-    
-    /*
+
+    /**
      * Determines how incoming message with no thread will be matched to existing chats.
      */
     private MatchMode matchMode = defaultMatchMode;
-    
+
     /**
      * Maps thread ID to chat.
      */
diff --git a/core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java b/core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java
index 36df70780..cdf134f44 100644
--- a/core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java
+++ b/core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java
@@ -27,7 +27,7 @@ import java.io.IOException;
  * 
  * @author Florian Schmaus
  * Based on code by Brian Wellington (bwelling@xbill.org)
- * @see <a href="http://en.wikipedia.org/wiki/Base32">Base32 Wikipedia entry<a>
+ * @see <a href="http://en.wikipedia.org/wiki/Base32">Base32 Wikipedia entry</a>
  *
  */
 public class Base32Encoder implements StringEncoder {
diff --git a/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index 825c78e80..5b7913cf6 100644
--- a/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -525,7 +525,7 @@ public class PacketParserUtils {
      *
      * @param parser the XML parser, positioned at the start of the compression stanza.
      * @return a collection of Stings with the methods included in the compression stanza.
-     * @throws Exception if an exception occurs while parsing the stanza.
+     * @throws XmlPullParserException if an exception occurs while parsing the stanza.
      */
     public static Collection<String> parseCompressionMethods(XmlPullParser parser)
             throws IOException, XmlPullParserException {
@@ -662,7 +662,7 @@ public class PacketParserUtils {
      *
      * @param parser the XML parser.
      * @return an stream error packet.
-     * @throws Exception if an exception occurs while parsing the packet.
+     * @throws XmlPullParserException if an exception occurs while parsing the packet.
      */
     public static StreamError parseStreamError(XmlPullParser parser) throws IOException,
             XmlPullParserException {
diff --git a/core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java b/core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java
index ea31c7701..5fa916810 100644
--- a/core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.jivesoftware.smack;
 
 import static org.junit.Assert.assertFalse;
@@ -30,7 +29,6 @@ import org.jivesoftware.smack.packet.Message.Type;
 import org.jivesoftware.smack.packet.Packet;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ChatConnectionTest {
@@ -66,7 +64,6 @@ public class ChatConnectionTest {
         assertEquals(MatchMode.BARE_JID, getConnection().getChatManager().getMatchMode());
     }
 
-    @Ignore
     @Test
     public void validateMessageTypeWithDefaults() {
         DummyConnection dc = getConnection();
@@ -108,9 +105,9 @@ public class ChatConnectionTest {
     
     @Test
     public void validateMessageTypeWithNoNormal() {
-        ChatManager.setDefaultIsNormalIncluded(false);
         DummyConnection dc = getConnection();
         ChatManager cm = dc.getChatManager();
+        cm.setNormalIncluded(false);
         TestChatManagerListener listener = new TestChatManagerListener(); 
         cm.addChatListener(listener);
         Message incomingChat = createChatPacket("134", true);
@@ -120,6 +117,7 @@ public class ChatConnectionTest {
 
         dc = getConnection();
         cm = dc.getChatManager();
+        cm.setNormalIncluded(false);
         listener = new TestChatManagerListener(); 
         cm.addChatListener(listener);
         incomingChat = createChatPacket("134", true);
diff --git a/core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/core/src/test/java/org/jivesoftware/smack/DummyConnection.java
index d5241acb8..faa48189c 100644
--- a/core/src/test/java/org/jivesoftware/smack/DummyConnection.java
+++ b/core/src/test/java/org/jivesoftware/smack/DummyConnection.java
@@ -46,7 +46,7 @@ import org.jivesoftware.smack.packet.Presence;
  * can be delivered using the {@linkplain #processPacket(Packet)} method.
  * It invokes the registered packet interceptors and listeners.
  * 
- * @see Connection
+ * @see XMPPConnection
  * @author Guenther Niess
  */
 public class DummyConnection extends XMPPConnection {
diff --git a/core/src/test/java/org/jivesoftware/smack/RosterTest.java b/core/src/test/java/org/jivesoftware/smack/RosterTest.java
index 16405884c..82702ac6e 100644
--- a/core/src/test/java/org/jivesoftware/smack/RosterTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/RosterTest.java
@@ -39,7 +39,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Tests that verifies the correct behavior of the {@see Roster} implementation.
+ * Tests that verifies the correct behavior of the {@link Roster} implementation.
  * 
  * @see Roster
  * @see <a href="http://xmpp.org/rfcs/rfc3921.html#roster">Roster Management</a>
@@ -489,7 +489,7 @@ public class RosterTest {
     }
 
     /**
-     * Remove all roster entries by iterating trough {@see Roster#getEntries()}
+     * Remove all roster entries by iterating trough {@link Roster#getEntries()}
      * and simulating receiving roster pushes from the server.
      * 
      * @param connection the dummy connection of which the provided roster belongs to.
diff --git a/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java b/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
index 827ab4a78..814dd2648 100644
--- a/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 /**
- * Tests that verify the correct behavior of the {@see Roster} implementation
+ * Tests that verify the correct behavior of the {@link Roster} implementation
  * with regard to roster versioning
  *
  * @see Roster
diff --git a/core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
index 96789aecd..e1336856a 100644
--- a/core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java
@@ -16,9 +16,13 @@
  */
 package org.jivesoftware.smack.packet;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import org.junit.Ignore;
+import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.examples.RecursiveElementNameAndTextQualifier;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
@@ -116,7 +120,6 @@ public class MessageTest {
         assertXMLEqual(control, message.toXML());
     }
 
-    @Ignore
     @Test
     public void multipleMessageBodiesTest() throws IOException, SAXException, ParserConfigurationException {
         final String messageBody1 = "This is a test of the emergency broadcast system, 1.";
@@ -147,7 +150,9 @@ public class MessageTest {
         message.addBody(null, messageBody1);
         message.addBody(lang2, messageBody2);
         message.addBody(lang3, messageBody3);
-        assertXMLEqual(control, message.toXML());
+        Diff xmlDiff = new Diff(control, message.toXML());
+        xmlDiff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
+        assertTrue(xmlDiff.similar());
 
         Collection<String> languages = message.getBodyLanguages();
         List<String> controlLanguages = new ArrayList<String>();
diff --git a/core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java b/core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
index 7858d32e8..1c6cd5e80 100644
--- a/core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java
@@ -17,10 +17,13 @@
 package org.jivesoftware.smack.packet;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
+
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.xml.sax.SAXException;
-import static junit.framework.Assert.assertEquals;
 
 import java.io.IOException;
 
diff --git a/core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
index 5fb767bd4..d34a20d92 100644
--- a/core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
+++ b/core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
@@ -19,22 +19,21 @@ package org.jivesoftware.smack.util;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLNotEqual;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Locale;
 import java.util.Properties;
 
 import org.custommonkey.xmlunit.DetailedDiff;
 import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.examples.RecursiveElementNameAndTextQualifier;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.test.util.TestUtils;
-//import org.jivesoftware.smackx.packet.DelayInformation;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -659,7 +658,6 @@ public class PacketParserUtilsTest {
     }
 
     @SuppressWarnings("deprecation")
-    @Ignore // gradle migration
     @Test
     public void invalidMessageBodyContainingTagTest() throws Exception {
         String control = XMLBuilder.create("message")
@@ -686,7 +684,7 @@ public class PacketParserUtilsTest {
             DetailedDiff diffs = new DetailedDiff(new Diff(control, message.toXML()));
             
             // body has no namespace URI, span is escaped 
-            assertEquals(4, diffs.getAllDifferences().size());
+            assertEquals(6, diffs.getAllDifferences().size());
         } catch(XmlPullParserException e) {
             fail("No parser exception should be thrown" + e.getMessage());
         }
@@ -735,7 +733,6 @@ public class PacketParserUtilsTest {
 
     }
 
-    @Ignore
     @Test
     public void multipleMessageBodiesParsingTest() throws Exception {
         String control = XMLBuilder.create("message")
@@ -757,9 +754,11 @@ public class PacketParserUtilsTest {
             .asString(outputProperties);
         
         Packet message = PacketParserUtils.parseMessage(TestUtils.getMessageParser(control));
-        assertXMLEqual(control, message.toXML());
+        Diff xmlDiff = new Diff(control, message.toXML());
+        xmlDiff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
+        assertTrue(xmlDiff.similar());
     }
-    
+
     @Test
     public void validateSimplePresence() throws Exception {
     	String stanza = "<presence from='juliet@example.com/balcony' to='romeo@example.net'/>";
@@ -798,59 +797,6 @@ public class PacketParserUtilsTest {
     	assertEquals(1, presence.getPriority());
     }
 
-//   @Ignore // gradle migration
-//  @Test
-//    public void validatePresenceWithDelayedDelivery() throws Exception {
-//    	String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
-//    			+ "<delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:41:07Z'/></presence>";
-//    	
-//    	Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
-//    	
-//    	DelayInformation delay = (DelayInformation) presence.getExtension("urn:xmpp:delay");
-//    	assertNotNull(delay);
-//    	Date date = StringUtils.parseDate("2002-09-10T23:41:07Z");
-//    	assertEquals(date, delay.getStamp());
-//    }
-
-//  @Ignore // gradle migration
-//  @Test
-//    public void validatePresenceWithLegacyDelayed() throws Exception {
-//    	String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
-//    			+ "<x xmlns='jabber:x:delay' stamp='20020910T23:41:07'/></presence>";
-//    	
-//    	Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
-//    	
-//    	DelayInformation delay = (DelayInformation) presence.getExtension("jabber:x:delay");
-//    	assertNotNull(delay);
-//    	Date date = StringUtils.parseDate("20020910T23:41:07");
-//    	Calendar cal = Calendar.getInstance();
-//    	cal.setTimeZone(TimeZone.getTimeZone("GMT"));
-//    	cal.setTime(date);
-//    	assertEquals(cal.getTime(), delay.getStamp());
-//    }
-
-    @SuppressWarnings("deprecation")
-    @Ignore // gradle migration
-    @Test
-    public void parsePresenceWithInvalidDelayedDelivery() throws Exception {
-    	String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
-    			+ "<delay xmlns='urn:xmpp:delay'/></presence>";
-    	
-    	Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
-    	assertNull(presence.getExtension("urn:xmpp:delay"));
-    }
-
-//  @Ignore // gradle migration
-//  @Test
-//    public void parsePresenceWithInvalidLegacyDelayed() throws Exception {
-//    	String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
-//    			+ "<x xmlns='jabber:x:delay'/></presence>";
-//    	
-//    	Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
-//    	DelayInformation delay = (DelayInformation) presence.getExtension("urn:xmpp:delay");
-//    	assertNull(delay);
-//    }
-
     private String determineNonDefaultLanguage() {
         String otherLanguage = "jp";
         Locale[] availableLocales = Locale.getAvailableLocales();
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
index 2d7fb70d5..15fec4e56 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java
@@ -35,7 +35,6 @@ import org.jivesoftware.smackx.caps.cache.SimpleDirectoryPersistentCache;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.xdata.FormField;
 import org.jivesoftware.smackx.xdata.packet.DataForm;
-import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -53,14 +52,12 @@ public class EntityCapsManagerTest {
         assertEquals("q07IKJEyjvHSyhy//CH0CxmKi8w=", ver);
     }
 
-    @Ignore // gradle migration
     @Test
     public void testSimpleDirectoryCacheBase64() throws IOException {
         EntityCapsManager.persistentCache = null;
         testSimpleDirectoryCache(Base64FileUrlEncoder.getInstance());
     }
 
-    @Ignore // gradle migration
     @Test
     public void testSimpleDirectoryCacheBase32() throws IOException {
         EntityCapsManager.persistentCache = null;
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
index 47641fb63..b6f70f62b 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java
@@ -16,10 +16,10 @@
  */
 package org.jivesoftware.smackx.delay.provider;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
-import java.io.IOException;
-import java.io.StringReader;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -27,19 +27,21 @@ import java.util.GregorianCalendar;
 import java.util.Properties;
 import java.util.TimeZone;
 
+import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.test.util.TestUtils;
+import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.util.XmppDateTime;
+import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.delay.packet.DelayInfo;
 import org.jivesoftware.smackx.delay.packet.DelayInformation;
 import org.jivesoftware.smackx.delay.provider.DelayInfoProvider;
 import org.jivesoftware.smackx.delay.provider.DelayInformationProvider;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 import com.jamesmurty.utils.XMLBuilder;
 
-public class DelayInformationTest {
+public class DelayInformationTest extends InitExtensions {
 
     private static Properties outputProperties = new Properties();
     static {
@@ -62,8 +64,8 @@ public class DelayInformationTest {
             .a("stamp", "2002-09-10T23:08:25Z")
             .t("Offline Storage")
             .asString(outputProperties);
-        
-        parser = getParser(control, "x");
+
+        parser = TestUtils.getParser(control, "x");
         delayInfo = (DelayInformation) p.parseExtension(parser);
         
         assertEquals("capulet.com", delayInfo.getFrom());
@@ -78,8 +80,8 @@ public class DelayInformationTest {
             .a("from", "capulet.com")
             .a("stamp", "2002-09-10T23:08:25Z")
             .asString(outputProperties);
-        
-        parser = getParser(control, "x");
+
+        parser = TestUtils.getParser(control, "x");
         delayInfo = (DelayInformation) p.parseExtension(parser);
 
         assertEquals("capulet.com", delayInfo.getFrom());
@@ -108,7 +110,7 @@ public class DelayInformationTest {
             .t("Offline Storage")
             .asString(outputProperties);
 
-        parser = getParser(control, "delay");
+        parser = TestUtils.getParser(control, "delay");
         delayInfo = (DelayInfo) p.parseExtension(parser);
         
         assertEquals("capulet.com", delayInfo.getFrom());
@@ -124,7 +126,7 @@ public class DelayInformationTest {
             .a("stamp", "2002-09-10T23:08:25Z")
             .asString(outputProperties);
         
-        parser = getParser(control, "delay");
+        parser = TestUtils.getParser(control, "delay");
         delayInfo = (DelayInfo) p.parseExtension(parser);
         
         assertEquals("capulet.com", delayInfo.getFrom());
@@ -150,8 +152,8 @@ public class DelayInformationTest {
             .a("from", "capulet.com")
             .a("stamp", "2002-09-10T23:08:25.12Z")
             .asString(outputProperties);
-        
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
+
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
         
         GregorianCalendar cal = (GregorianCalendar) calendar.clone(); 
         cal.add(Calendar.MILLISECOND, 12);
@@ -163,9 +165,9 @@ public class DelayInformationTest {
             .a("from", "capulet.com")
             .a("stamp", "2002-09-10T23:08:25Z")
             .asString(outputProperties);
-        
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
-        
+
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
+
         assertEquals(calendar.getTime(), delayInfo.getStamp());
 
         // XEP-0082 date format without milliseconds and leading 0 in month
@@ -175,7 +177,7 @@ public class DelayInformationTest {
             .a("stamp", "2002-9-10T23:08:25Z")
             .asString(outputProperties);
         
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
         
         assertEquals(calendar.getTime(), delayInfo.getStamp());
 
@@ -186,7 +188,7 @@ public class DelayInformationTest {
             .a("stamp", "20020910T23:08:25")
             .asString(outputProperties);
         
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
         
         assertEquals(calendar.getTime(), delayInfo.getStamp());
 
@@ -205,9 +207,9 @@ public class DelayInformationTest {
             .a("from", "capulet.com")
             .a("stamp", dateFormat.format(dateInPast.getTime()))
             .asString(outputProperties);
-        
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
-        
+
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
+
         assertEquals(dateInPast.getTime(), delayInfo.getStamp());
 
         // XEP-0091 date format from SMACK-243
@@ -216,9 +218,9 @@ public class DelayInformationTest {
             .a("from", "capulet.com")
             .a("stamp", "200868T09:16:20")
             .asString(outputProperties);
-        
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
-        Date controlDate = XmppDateTime.parseXEP0082Date("2008-06-08T09:16:20.0Z");
+
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
+        Date controlDate = XmppDateTime.parseDate("2008-06-08T09:16:20.0Z");
         
         assertEquals(controlDate, delayInfo.getStamp());
 
@@ -229,25 +231,48 @@ public class DelayInformationTest {
             .a("stamp", "yesterday")
             .asString(outputProperties);
         
-        delayInfo = (DelayInfo) p.parseExtension(getParser(control, "delay"));
+        delayInfo = (DelayInfo) p.parseExtension(TestUtils.getParser(control, "delay"));
         
         assertNotNull(delayInfo.getStamp());
 
     }
-    
-    private XmlPullParser getParser(String control, String startTag)
-                    throws XmlPullParserException, IOException {
-        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        parser.setInput(new StringReader(control));
 
-        while (true) {
-            if (parser.next() == XmlPullParser.START_TAG
-                            && parser.getName().equals(startTag)) {
-                break;
-            }
-        }
-        return parser;
+    @Test
+    public void validatePresenceWithDelayedDelivery() throws Exception {
+        String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
+                + "<delay xmlns='urn:xmpp:delay' stamp='2002-09-10T23:41:07Z'/></presence>";
+
+        Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
+        
+        DelayInformation delay = (DelayInformation) presence.getExtension("urn:xmpp:delay");
+        assertNotNull(delay);
+        Date date = XmppDateTime.parseDate("2002-09-10T23:41:07Z");
+        assertEquals(date, delay.getStamp());
     }
 
+    @Test
+    public void validatePresenceWithLegacyDelayed() throws Exception {
+        String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
+                        + "<x xmlns='jabber:x:delay' stamp='20020910T23:41:07'/></presence>";
+
+        Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
+
+        DelayInformation delay = (DelayInformation) presence.getExtension("jabber:x:delay");
+        assertNotNull(delay);
+        Date date = XmppDateTime.parseDate("20020910T23:41:07");
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeZone(TimeZone.getTimeZone("GMT"));
+        cal.setTime(date);
+        assertEquals(cal.getTime(), delay.getStamp());
+    }
+
+    @Test
+    public void parsePresenceWithInvalidLegacyDelayed() throws Exception {
+        String stanza = "<presence from='mercutio@example.com' to='juliet@example.com'>"
+                        + "<x xmlns='jabber:x:delay'/></presence>";
+
+        Presence presence = PacketParserUtils.parsePresence(TestUtils.getPresenceParser(stanza));
+        DelayInformation delay = (DelayInformation) presence.getExtension("urn:xmpp:delay");
+        assertNull((Object)delay);
+    }
 }
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
index c3b36524b..e497c31b7 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2012 Florian Schmaus
+ * Copyright 2012-2014 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,13 +26,13 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.ping.packet.Ping;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
-public class PingTest {
+public class PingTest extends InitExtensions {
     private DummyConnection dummyCon;
     private ThreadedDummyConnection threadedCon;
     
@@ -42,7 +42,6 @@ public class PingTest {
         threadedCon = new ThreadedDummyConnection();
     }
 
-    @Ignore // gradle migration
     @Test
     public void checkProvider() throws Exception {
         // @formatter:off
@@ -181,7 +180,6 @@ public class PingTest {
         assertFalse(pingSuccess);
     }
 
-    @Ignore // gradle migration
     @Test
     public void checkSuccessfulDiscoRequest() throws Exception {
         ThreadedDummyConnection con = new ThreadedDummyConnection();
@@ -204,7 +202,6 @@ public class PingTest {
         assertTrue(pingSupported);
     }
 
-    @Ignore // gradle migration
     @Test
     public void checkUnuccessfulDiscoRequest() throws Exception {
         ThreadedDummyConnection con = new ThreadedDummyConnection();
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
index 2e93e0ea1..b55f3163c 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java
+++ b/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.*;
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -25,10 +25,10 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xmlpull.v1.XmlPullParser;
 
@@ -37,8 +37,7 @@ import org.xmlpull.v1.XmlPullParser;
  * @author Robin Collier
  *
  */
-public class ItemValidationTest
-{
+public class ItemValidationTest extends InitExtensions {
 	private ThreadedDummyConnection connection;
 
 	@Before
@@ -93,7 +92,6 @@ public class ItemValidationTest
 		assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML());
 	}
 
-    @Ignore // gradle migration
 	@Test
 	public void parseBasicItem() throws Exception
 	{
@@ -121,7 +119,6 @@ public class ItemValidationTest
         assertEquals("testid1", ((Item)itemExt).getId());
 	}
 
-    @Ignore // gradle migration
     @Test
     public void parseSimplePayloadItem() throws Exception
     {
@@ -155,7 +152,6 @@ public class ItemValidationTest
         assertXMLEqual(itemContent, payload.toXML());
     }
 
-    @Ignore // gradle migration
     @Test
     public void parseComplexItem() throws Exception
     {
@@ -203,7 +199,6 @@ public class ItemValidationTest
         assertXMLEqual(itemContent, payload.toXML());
     }
 
-    @Ignore // gradle migration
     @Test
     public void parseEmptyTag() throws Exception
     {
diff --git a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
index 031a95105..356182bd7 100644
--- a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
+++ b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java
@@ -21,31 +21,27 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.IOException;
-import java.io.StringReader;
 import java.util.Properties;
 
 import org.jivesoftware.smack.DummyConnection;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.test.util.TestUtils;
 import org.jivesoftware.smack.util.PacketParserUtils;
+import org.jivesoftware.smackx.InitExtensions;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.xmlpull.v1.XmlPullParserFactory;
 import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
 
 import com.jamesmurty.utils.XMLBuilder;
 
-public class DeliveryReceiptTest {
+public class DeliveryReceiptTest extends InitExtensions {
 
     private static Properties outputProperties = new Properties();
     static {
         outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
     }
 
-    @Ignore // gradle migration
     @Test
     public void receiptTest() throws Exception {
         XmlPullParser parser;
@@ -57,7 +53,7 @@ public class DeliveryReceiptTest {
                 .a("xmlns", "urn:xmpp:receipts")
             .asString(outputProperties);
         
-        parser = getParser(control, "message");
+        parser = TestUtils.getMessageParser(control);
         Packet p = PacketParserUtils.parseMessage(parser);
 
         DeliveryReceiptRequest drr = (DeliveryReceiptRequest)p.getExtension(
@@ -129,18 +125,4 @@ public class DeliveryReceiptTest {
         assertEquals("romeo@montague.com", reply.getTo());
         assertEquals("test-receipt-request", r.getId());
     }
-
-    private XmlPullParser getParser(String control, String startTag)
-                    throws XmlPullParserException, IOException {
-        XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
-        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
-        parser.setInput(new StringReader(control));
-        while (true) {
-            if (parser.next() == XmlPullParser.START_TAG
-                            && parser.getName().equals(startTag)) {
-                break;
-            }
-        }
-        return parser;
-    }
 }