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 664b3e657..604b644ca 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
@@ -41,6 +41,8 @@ import org.jxmpp.jid.impl.JidCreate;
  */
 public class MamPrefsIQProvider extends IQProvider<MamPrefsIQ> {
 
+    public static final MamPrefsIQProvider INSTANCE = new MamPrefsIQProvider();
+
     @Override
     public MamPrefsIQ parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
         String defaultBehaviorString = parser.getAttributeValue("", "default");
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 cd5d4c0ca..956d2057b 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
@@ -19,54 +19,62 @@ package org.jivesoftware.smackx.mam;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.test.util.SmackTestUtil;
+import org.jivesoftware.smack.test.util.SmackTestUtil.XmlPullParserKind;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
 
 import org.jivesoftware.smackx.mam.element.MamPrefsIQ;
 import org.jivesoftware.smackx.mam.provider.MamPrefsIQProvider;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.jxmpp.jid.Jid;
 
 public class MamPrefIQProviderTest extends MamTest {
 
-    private static final String exampleMamPrefsIQ1 = "<iq type='set' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:2' default='roster'>"
+    private static final String exampleMamPrefsIQ1 = "<prefs xmlns='urn:xmpp:mam:2' default='roster'>"
             + "<always>" + "<jid>romeo@montague.lit</jid>" + "</always>" + "<never>"
-            + "<jid>montague@montague.lit</jid>" + "</never>" + "</prefs>" + "</iq>";
+            + "<jid>montague@montague.lit</jid>" + "</never>" + "</prefs>";
 
-    private static final String exampleMamPrefsIQ2 = "<iq type='set' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:2' default='roster'>"
+    private static final String exampleMamPrefsIQ2 = "<prefs xmlns='urn:xmpp:mam:2' default='roster'>"
             + "<always>" + "<jid>romeo@montague.lit</jid>" + "<jid>montague@montague.lit</jid>" + "</always>"
-            + "<never>" + "</never>" + "</prefs>" + "</iq>";
+            + "<never>" + "</never>" + "</prefs>";
 
-    private static final String exampleMamPrefsIQ3 = "<iq type='get' id='juliet3'>" + "<prefs xmlns='urn:xmpp:mam:2'>" + "</prefs>"
-            + "</iq>";
+    private static final String exampleMamPrefsIQ3 =  "<prefs xmlns='urn:xmpp:mam:2'>" + "</prefs>";
 
     private static final String exampleMamPrefsResultIQ = "<iq type='result' id='juliet3'>"
             + "<prefs xmlns='urn:xmpp:mam:2' default='roster'>" + "<always>" + "<jid>romeo@montague.lit</jid>"
             + "</always>" + "<never>" + "<jid>sarasa@montague.lit</jid>" + "<jid>montague@montague.lit</jid>"
             + "</never>" + "</prefs>" + "</iq>";
 
-    @Test
-    public void checkMamPrefsIQProvider() throws Exception {
-        XmlPullParser parser1 = PacketParserUtils.getParserFor(exampleMamPrefsIQ1);
-        MamPrefsIQ mamPrefIQ1 = new MamPrefsIQProvider().parse(parser1);
+    @ParameterizedTest
+    @EnumSource(value = SmackTestUtil.XmlPullParserKind.class)
+    public void checkMamPrefsIQProvider(XmlPullParserKind parserKind)
+                    throws XmlPullParserException, IOException, SmackParsingException {
+        XmlPullParser parser1 = SmackTestUtil.getParserFor(exampleMamPrefsIQ1, parserKind);
+        MamPrefsIQ mamPrefIQ1 = MamPrefsIQProvider.INSTANCE.parse(parser1);
 
         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);
+        XmlPullParser parser2 = SmackTestUtil.getParserFor(exampleMamPrefsIQ2, parserKind);
+        MamPrefsIQ mamPrefIQ2 = MamPrefsIQProvider.INSTANCE.parse(parser2);
         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);
+        XmlPullParser parser3 = SmackTestUtil.getParserFor(exampleMamPrefsIQ3, parserKind);
+        MamPrefsIQ mamPrefIQ3 = MamPrefsIQProvider.INSTANCE.parse(parser3);
         assertEquals(IQ.Type.set, mamPrefIQ3.getType());
     }