diff --git a/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java
index af7e48abcf..6b53b34d8b 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/DeadLetterExchange.java
@@ -170,7 +170,7 @@ protected void releaseResources() throws IOException {
         channel.queueBind(DLQ, DLX, "test");
 
         //measure round-trip latency
-        QueueMessageConsumer c = new QueueMessageConsumer(channel);
+        AccumulatingMessageConsumer c = new AccumulatingMessageConsumer(channel);
         String cTag = channel.basicConsume(TEST_QUEUE_NAME, true, c);
         long start = System.currentTimeMillis();
         publish(null, "test");
@@ -536,6 +536,9 @@ public void process(GetResponse getResponse) {
                 assertNotNull(headers);
                 ArrayList<Object> death = (ArrayList<Object>) headers.get("x-death");
                 assertNotNull(death);
+                assertNotNull(headers.get("x-first-death-queue"));
+                assertNotNull(headers.get("x-first-death-reason"));
+                assertNotNull(headers.get("x-first-death-exchange"));
                 assertEquals(1, death.size());
                 assertDeathReason(death, 0, TEST_QUEUE_NAME, reason,
                         "amq.direct",
@@ -562,7 +565,7 @@ private void sleep(long millis) {
 
     /* check that each message arrives within epsilon of the
        publication time + TTL + latency */
-    private void checkPromptArrival(QueueMessageConsumer c,
+    private void checkPromptArrival(AccumulatingMessageConsumer c,
                                     int count, long latency) throws Exception {
         long epsilon = TTL / 10;
         for (int i = 0; i < count; i++) {
@@ -697,11 +700,11 @@ private static String randomQueueName() {
         return DeadLetterExchange.class.getSimpleName() + "-" + UUID.randomUUID().toString();
     }
 
-    class QueueMessageConsumer extends DefaultConsumer {
+    class AccumulatingMessageConsumer extends DefaultConsumer {
 
         BlockingQueue<byte[]> messages = new LinkedBlockingQueue<byte[]>();
 
-        public QueueMessageConsumer(Channel channel) {
+        public AccumulatingMessageConsumer(Channel channel) {
             super(channel);
         }