diff --git a/tests/src/test/java/cz/moneta/test/system/messaging/ImqFirstVisionTest.java b/tests/src/test/java/cz/moneta/test/system/messaging/ImqFirstVisionTest.java
index 3e587ee..114ac83 100644
--- a/tests/src/test/java/cz/moneta/test/system/messaging/ImqFirstVisionTest.java
+++ b/tests/src/test/java/cz/moneta/test/system/messaging/ImqFirstVisionTest.java
@@ -13,62 +13,40 @@ import cz.moneta.test.harness.endpoints.imq.ImqFirstVisionQueue;
 @TestScenario(name = "IBM MQ First Vision DSL Tests")
 public class ImqFirstVisionTest {
 
-	@TestCase(name = "Send JSON message")
+	@TestCase(name = "Send and receive JSON message")
 	public void sendJsonMessage(Harness harness) {
 		harness.withImqFirstVision().toQueue(ImqFirstVisionQueue.PAYMENT_NOTIFICATIONS).asJson()
 				.withPayload("{\"paymentId\": \"PAY-456\", \"result\": \"OK\"}").send();
-	}
 
-	@TestCase(name = "Receive JSON message")
-	public void receiveJsonMessage(Harness harness) {
 		harness.withImqFirstVision().fromQueue(ImqFirstVisionQueue.PAYMENT_NOTIFICATIONS).asJson()
 				.receiveWhere(msg -> msg.extract("paymentId").equals("PAY-456")).withTimeout(10, TimeUnit.SECONDS)
 				.andAssertFieldValue("result", "OK");
+
 	}
 
-	@TestCase(name = "Send XML message")
+	@TestCase(name = "Send and receive XML message")
 	public void sendXmlMessage(Harness harness) {
 		harness.withImqFirstVision().toQueue(ImqFirstVisionQueue.MF_REQUESTS).asXml()
 				.withPayload("<request><accountId>12345</accountId><balance>50000</balance></request>").send();
-	}
-
-	@TestCase(name = "Receive XML message")
-	public void receiveXmlMessage(Harness harness) {
 		harness.withImqFirstVision().fromQueue(ImqFirstVisionQueue.MF_RESPONSES).asXml()
 				.receiveWhere(msg -> msg.extract("/request/accountId").equals("12345"))
 				.withTimeout(15, TimeUnit.SECONDS).andAssertFieldValue("/request/balance", "50000");
+
 	}
 
-	@TestCase(name = "Send UTF-8 message as bytes")
+	@TestCase(name = "Send and receive UTF-8 message as bytes")
 	public void sendUtf8BytesMessage(Harness harness) {
 		harness.withImqFirstVision().toQueue(ImqFirstVisionQueue.MF_UTF8).asUtf8().withPayload("DATA|12345|ÚČET|CZK")
 				.send();
-	}
-
-	@TestCase(name = "Receive UTF-8 message as bytes")
-	public void receiveUtf8BytesMessage(Harness harness) {
 		harness.withImqFirstVision().fromQueue(ImqFirstVisionQueue.MF_UTF8).asUtf8()
 				.receiveWhere(msg -> msg.getBody().contains("12345")).withTimeout(15, TimeUnit.SECONDS);
 	}
 
-	@TestCase(name = "Send EBCDIC message as bytes")
+	@TestCase(name = "Send and receive EBCDIC message as bytes")
 	public void sendEbcdicBytesMessage(Harness harness) {
 		harness.withImqFirstVision().toQueue(ImqFirstVisionQueue.MF_EBCDIC).asEbcdic()
 				.withPayload("PŘIKAZ|12345|ZŮSTATEK|CZK").send();
-	}
-
-	@TestCase(name = "Receive EBCDIC message as bytes")
-	public void receiveEbcdicBytesMessage(Harness harness) {
 		harness.withImqFirstVision().fromQueue(ImqFirstVisionQueue.MF_EBCDIC).asEbcdic()
 				.receiveWhere(msg -> msg.getBody().contains("12345")).withTimeout(15, TimeUnit.SECONDS);
 	}
-
-	@TestCase(name = "Create and send message with incremental payload building")
-	public void createAndSendMessageWithIncrementalPayload(Harness harness) {
-		harness.withImqFirstVision().toQueue(ImqFirstVisionQueue.PAYMENT_NOTIFICATIONS).withPayload("{}")
-				.addField("paymentId", "PAY-456").addField("amount", 15000).addField("currency", "CZK")
-				.addField("beneficiary", new Object()).addField("beneficiary", "name", "Jan Novák")
-				.addField("beneficiary", "accountNumber", "1234567890/0100").send();
-	}
-
 }
diff --git a/tests/src/test/java/cz/moneta/test/system/messaging/ImqIncrementalMessageTest.java b/tests/src/test/java/cz/moneta/test/system/messaging/ImqIncrementalMessageTest.java
new file mode 100644
index 0000000..a05909e
--- /dev/null
+++ b/tests/src/test/java/cz/moneta/test/system/messaging/ImqIncrementalMessageTest.java
@@ -0,0 +1,18 @@
+package cz.moneta.test.system.messaging;
+
+import cz.moneta.test.dsl.Harness;
+import cz.moneta.test.harness.annotations.TestCase;
+import cz.moneta.test.harness.annotations.TestScenario;
+import cz.moneta.test.harness.endpoints.imq.ImqFirstVisionQueue;
+
+@TestScenario(name = "IBM MQ First Vision DSL Incremental Message Building Test")
+public class ImqIncrementalMessageTest {
+
+    @TestCase(name = "Create and send message with incremental payload building")
+    public void createAndSendMessageWithIncrementalPayload(Harness harness) {
+        harness.withImqFirstVision().toQueue(ImqFirstVisionQueue.PAYMENT_NOTIFICATIONS).withPayload("{}")
+                .addField("paymentId", "PAY-456").addField("amount", 15000).addField("currency", "CZK")
+                .addField("beneficiary", new Object()).addField("beneficiary", "name", "Jan Novák")
+                .addField("beneficiary", "accountNumber", "1234567890/0100").send();
+    }
+}