2 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp
index aeff35dbf0..801e33d412 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/cpp/src/tests/ClientSessionTest.cpp
@@ -157,7 +157,7 @@ QPID_AUTO_TEST_CASE(testDispatcherThread)
         fix.session.messageTransfer(content=TransferContent(lexical_cast<string>(i), "my-queue"));
     }
     t.join();
-    BOOST_CHECK_EQUAL(count, listener.messages.size());        
+    BOOST_REQUIRE_EQUAL(count, listener.messages.size());        
     for (size_t i = 0; i < count; ++i) 
         BOOST_CHECK_EQUAL(lexical_cast<string>(i), listener.messages[i].getData());
 }
diff --git a/cpp/src/tests/SessionState.cpp b/cpp/src/tests/SessionState.cpp
index 4beef87cfe..40922b3be8 100644
--- a/cpp/src/tests/SessionState.cpp
+++ b/cpp/src/tests/SessionState.cpp
@@ -65,17 +65,18 @@ string str(const boost::iterator_range<vector<AMQFrame>::const_iterator>& frames
 // Make a transfer command frame.
 AMQFrame transferFrame(bool hasContent) {
     AMQFrame t(in_place<MessageTransferBody>());
-    t.setFirstFrame();
-    t.setLastFrame();
-    t.setFirstSegment();
+    t.setFirstFrame(true);
+    t.setLastFrame(true);
+    t.setFirstSegment(true);
     t.setLastSegment(!hasContent);
     return t;
 }
 // Make a content frame
 AMQFrame contentFrame(string content, bool isLast=true) {
     AMQFrame f(in_place<AMQContentBody>(content));
-    f.setFirstFrame();
-    f.setLastFrame();
+    f.setFirstFrame(true);
+    f.setLastFrame(true);
+    f.setFirstSegment(false);
     f.setLastSegment(isLast);
     return f;
 }