2 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/tests/MessageUtils.h b/cpp/src/tests/MessageUtils.h
index a6a5aa65fd..2c205da20f 100644
--- a/cpp/src/tests/MessageUtils.h
+++ b/cpp/src/tests/MessageUtils.h
@@ -107,6 +107,7 @@ struct MessageUtils
             AMQFrame data((AMQContentBody(content)));
             msg->getFrames().append(data);
         }
+        if (ttl) msg->computeExpiration(new broker::ExpiryPolicy);
         return Message(msg, msg);
     }
 };
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index c44483f8dd..99c6880b26 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -188,7 +188,6 @@ void addMessagesToQueue(uint count, Queue& queue, uint oddTtl = 200, uint evenTt
 {
     for (uint i = 0; i < count; i++) {
         Message m = MessageUtils::createMessage("exchange", "key", i % 2 ? oddTtl : evenTtl);
-        m.computeExpiration(new broker::ExpiryPolicy);
         queue.deliver(m);
     }
 }