diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java
new file mode 100644
index 000000000..0d174827b
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/AbstractChatIntegrationTest.java
@@ -0,0 +1,35 @@
+/**
+ *
+ * Copyright 2018 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.chat2;
+
+import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
+import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
+
+public abstract class AbstractChatIntegrationTest extends AbstractSmackIntegrationTest {
+
+    protected final ChatManager chatManagerOne;
+    protected final ChatManager chatManagerTwo;
+    protected final ChatManager chatManagerThree;
+
+    protected AbstractChatIntegrationTest(SmackIntegrationTestEnvironment environment) {
+        super(environment);
+        chatManagerOne = ChatManager.getInstanceFor(conOne);
+        chatManagerTwo = ChatManager.getInstanceFor(conTwo);
+        chatManagerThree = ChatManager.getInstanceFor(conThree);
+    }
+
+}
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/IncomingMessageListenerIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/IncomingMessageListenerIntegrationTest.java
new file mode 100644
index 000000000..ca76ab280
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/IncomingMessageListenerIntegrationTest.java
@@ -0,0 +1,56 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub
+ *
+ * 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.chat2;
+
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.StringUtils;
+
+import org.igniterealtime.smack.inttest.SmackIntegrationTest;
+import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
+import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
+import org.jxmpp.jid.EntityBareJid;
+
+public class IncomingMessageListenerIntegrationTest extends AbstractChatIntegrationTest {
+
+    public IncomingMessageListenerIntegrationTest(SmackIntegrationTestEnvironment environment) {
+        super(environment);
+    }
+
+    @SmackIntegrationTest
+    public void test() throws Exception {
+        final String body = StringUtils.randomString(16);
+        final SimpleResultSyncPoint syncPoint = new SimpleResultSyncPoint();
+        final IncomingChatMessageListener listener = new IncomingChatMessageListener() {
+            @Override
+            public void newIncomingMessage(EntityBareJid from, Message message, Chat chat) {
+                if (body.equals(message.getBody())) {
+                    syncPoint.signal();
+                }
+            }
+        };
+
+        try {
+            chatManagerTwo.addIncomingListener(listener);
+            Chat chat = chatManagerOne.chatWith(conTwo.getUser().asEntityBareJid());
+            chat.send(body);
+            syncPoint.waitForResult(timeout);
+        }
+        finally {
+            chatManagerTwo.removeIncomingListener(listener);
+        }
+    }
+}
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/OutgoingMessageListenerIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/OutgoingMessageListenerIntegrationTest.java
new file mode 100644
index 000000000..a9221de0c
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/OutgoingMessageListenerIntegrationTest.java
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub
+ *
+ * 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.chat2;
+
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.util.StringUtils;
+
+import org.igniterealtime.smack.inttest.SmackIntegrationTest;
+import org.igniterealtime.smack.inttest.SmackIntegrationTestEnvironment;
+import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
+import org.jxmpp.jid.EntityBareJid;
+
+public class OutgoingMessageListenerIntegrationTest extends AbstractChatIntegrationTest {
+
+    public OutgoingMessageListenerIntegrationTest(SmackIntegrationTestEnvironment environment) {
+        super(environment);
+    }
+
+    @SmackIntegrationTest
+    public void outgoingMessageListenerTest() throws Exception {
+        final String body = StringUtils.randomString(16);
+        final SimpleResultSyncPoint syncPoint = new SimpleResultSyncPoint();
+        final OutgoingChatMessageListener listener = new OutgoingChatMessageListener() {
+            @Override
+            public void newOutgoingMessage(EntityBareJid to, Message message, Chat chat) {
+                if (message.getBody().equals(body)) {
+                    syncPoint.signal();
+                }
+            }
+        };
+
+        EntityBareJid peer = conTwo.getUser().asEntityBareJid();
+
+        try {
+            chatManagerOne.addOutgoingListener(listener);
+            Chat chat = chatManagerOne.chatWith(peer);
+            chat.send(body);
+            syncPoint.waitForResult(timeout);
+        }
+        finally {
+            chatManagerOne.removeOutgoingListener(listener);
+        }
+    }
+}
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/package-info.java
new file mode 100644
index 000000000..a618ef208
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/chat2/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2018 Paul Schaub
+ *
+ * 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.
+ */
+
+/**
+ * Integration Tests for the chat2 API.
+ */
+package org.jivesoftware.smack.chat2;