diff --git a/test-harness/src/main/java/cz/moneta/test/harness/endpoints/messaging/IbmMqEndpoint.java b/test-harness/src/main/java/cz/moneta/test/harness/endpoints/messaging/IbmMqEndpoint.java
index b5ec76a..79bb483 100644
--- a/test-harness/src/main/java/cz/moneta/test/harness/endpoints/messaging/IbmMqEndpoint.java
+++ b/test-harness/src/main/java/cz/moneta/test/harness/endpoints/messaging/IbmMqEndpoint.java
@@ -16,16 +16,16 @@ import java.util.function.Predicate;
 
 public class IbmMqEndpoint implements Endpoint {
 
-    private static final String CONFIG_HOST = "messaging.ibmmq.host";
-    private static final String CONFIG_PORT = "messaging.ibmmq.port";
-    private static final String CONFIG_CHANNEL = "messaging.ibmmq.channel";
-    private static final String CONFIG_QUEUE_MANAGER = "messaging.ibmmq.queue-manager";
-    private static final String CONFIG_KEYSTORE_PATH = "messaging.ibmmq.keystore.path";
-    private static final String CONFIG_KEYSTORE_PASSWORD = "messaging.ibmmq.keystore.password";
+    private static final String CONFIG_HOST = "endpoints.imq-first-vision.host";
+    private static final String CONFIG_PORT = "endpoints.imq-first-vision.port";
+    private static final String CONFIG_CHANNEL = "endpoints.imq-first-vision.channel";
+    private static final String CONFIG_QUEUE_MANAGER = "endpoints.imq-first-vision.queue-manager";
+    private static final String CONFIG_KEYSTORE_PATH = "endpoints.imq-first-vision.keystore.path";
+    private static final String CONFIG_KEYSTORE_PASSWORD = "endpoints.imq-first-vision.keystore.password";
     private static final String CONFIG_VAULT_PATH = "vault.path.messaging.ibmmq";
-    private static final String CONFIG_USERNAME = "messaging.ibmmq.username";
-    private static final String CONFIG_PASSWORD = "messaging.ibmmq.password";
-    private static final String CONFIG_SSL_CYPHER_SUITES = "messaging.ibmmq.ssl-cipher-suite";
+    private static final String CONFIG_USERNAME = "endpoints.imq-first-vision.username";
+    private static final String CONFIG_PASSWORD = "endpoints.imq-first-vision.password";
+    private static final String CONFIG_SSL_CYPHER_SUITES = "endpoints.imq-first-vision.ssl-cipher-suite";
 
     private final StoreAccessor store;
     private volatile IbmMqConnector connector;
diff --git a/tests/src/test/java/cz/moneta/test/system/messaging/SendMQMessage.java b/tests/src/test/java/cz/moneta/test/system/messaging/SendMQMessage.java
index cc84f32..b51d90f 100644
--- a/tests/src/test/java/cz/moneta/test/system/messaging/SendMQMessage.java
+++ b/tests/src/test/java/cz/moneta/test/system/messaging/SendMQMessage.java
@@ -44,5 +44,14 @@ public class SendMQMessage {
 		harness.withMessaging().from("mainframe-utf8-queue").asUtf8()
 				.receiveWhere(msg -> msg.getBody().contains("12345")).withTimeout(5, TimeUnit.SECONDS);
 	}
+	
+	@TestCase(name = "Send EBCDIC message")
+	public void sendEbcdicMessage(Harness harness) {
+
+		harness.withMessaging().to("mainframe-ebcdic-queue").asEbcdic().withPayload("DATA|12345|ÚČET|CZK").send();
+
+		harness.withMessaging().from("mainframe-ebcdic-queue").asEbcdic()
+				.receiveWhere(msg -> msg.getBody().contains("12345")).withTimeout(5, TimeUnit.SECONDS);
+	}
 
 }
diff --git a/tests/src/test/resources/envs/mq b/tests/src/test/resources/envs/mq
index d25b30e..26bc9c9 100644
--- a/tests/src/test/resources/envs/mq
+++ b/tests/src/test/resources/envs/mq
@@ -10,15 +10,15 @@ messaging.kafka.schema-registry-url=https://psrc-xxxxx.eu-central-1.aws.confluen
 messaging.kafka.value-serializer=avro
 
 # Messaging - IBM MQ
-messaging.ibmmq.host=localhost
-messaging.ibmmq.port=1414
-messaging.ibmmq.channel=DEV.APP.SVRCONN
-messaging.ibmmq.queue-manager=QM1
-messaging.ibmmq.ssl-cipher-suite=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-messaging.ibmmq.keystore.path=/home/kamma/aa/mq-docker/truststore.jks
-messaging.ibmmq.keystore.password=changeit
-messaging.ibmmq.username=app
-messaging.ibmmq.password=app
+endpoints.imq-first-vision.host=localhost
+endpoints.imq-first-vision.port=1414
+endpoints.imq-first-vision.channel=DEV.APP.SVRCONN
+endpoints.imq-first-vision.queue-manager=QM1
+endpoints.imq-first-vision.ssl-cipher-suite=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+endpoints.imq-first-vision.keystore.path=/home/kamma/aa/mq-docker/truststore.jks
+endpoints.imq-first-vision.keystore.password=changeit
+endpoints.imq-first-vision.username=app
+endpoints.imq-first-vision.password=app
 
 # Messaging destinations
 messaging.destination.order-events.type=kafka
@@ -30,7 +30,7 @@ messaging.destination.mainframe-requests.type=ibmmq
 messaging.destination.mainframe-requests.queue=XML.QUEUE.1
 messaging.destination.mainframe-requests.format=xml
 messaging.destination.mainframe-ebcdic-queue.type=ibmmq
-messaging.destination.mainframe-ebcdic-queue.queue=MF.EBCDIC.QUEUE
+messaging.destination.mainframe-ebcdic-queue.queue=EBCDIC.QUEUE.1
 messaging.destination.mainframe-ebcdic-queue.format=ebcdic_870
 messaging.destination.mainframe-utf8-queue.type=ibmmq
 messaging.destination.mainframe-utf8-queue.queue=UTF8.QUEUE.1