diff --git a/src/test/java/org/qortal/test/SerializationTests.java b/src/test/java/org/qortal/test/SerializationTests.java
index d9fe978c..8422bd9c 100644
--- a/src/test/java/org/qortal/test/SerializationTests.java
+++ b/src/test/java/org/qortal/test/SerializationTests.java
@@ -47,7 +47,6 @@ public class SerializationTests extends Common {
 				switch (txType) {
 					case GENESIS:
 					case ACCOUNT_FLAGS:
-					case CHAT:
 					case PUBLICIZE:
 					case AIRDROP:
 					case ENABLE_FORGING:
diff --git a/src/test/java/org/qortal/test/common/transaction/ChatTestTransaction.java b/src/test/java/org/qortal/test/common/transaction/ChatTestTransaction.java
new file mode 100644
index 00000000..bab1f1a0
--- /dev/null
+++ b/src/test/java/org/qortal/test/common/transaction/ChatTestTransaction.java
@@ -0,0 +1,40 @@
+package org.qortal.test.common.transaction;
+
+import org.qortal.account.PrivateKeyAccount;
+import org.qortal.crypto.Crypto;
+import org.qortal.data.transaction.ChatTransactionData;
+import org.qortal.data.transaction.TransactionData;
+import org.qortal.repository.DataException;
+import org.qortal.repository.Repository;
+
+import java.util.Random;
+
+public class ChatTestTransaction extends TestTransaction {
+
+	public static TransactionData randomTransaction(Repository repository, PrivateKeyAccount account, boolean wantValid) throws DataException {
+		Random random = new Random();
+		byte[] orderId = new byte[64];
+		random.nextBytes(orderId);
+
+		String sender = Crypto.toAddress(account.getPublicKey());
+		int nonce = 1234567;
+
+		// Generate random recipient
+		byte[] randomPrivateKey = new byte[32];
+		random.nextBytes(randomPrivateKey);
+		PrivateKeyAccount recipientAccount = new PrivateKeyAccount(repository, randomPrivateKey);
+		String recipient = Crypto.toAddress(recipientAccount.getPublicKey());
+
+		byte[] chatReference = new byte[64];
+		random.nextBytes(chatReference);
+
+		byte[] data = new byte[4000];
+		random.nextBytes(data);
+
+		boolean isText = true;
+		boolean isEncrypted = true;
+
+		return new ChatTransactionData(generateBase(account), sender, nonce, recipient, chatReference, data, isText, isEncrypted);
+	}
+
+}