diff --git a/test/helpers/tracker.hpp b/test/helpers/tracker.hpp
index bc3d4b47..1fec1556 100644
--- a/test/helpers/tracker.hpp
+++ b/test/helpers/tracker.hpp
@@ -42,9 +42,10 @@ namespace test {
     value_list values2(x2.begin(), x2.end());
     values1.sort();
     values2.sort();
-    BOOST_TEST(values1.size() == values2.size() &&
-               test::equal(values1.begin(), values1.end(), values2.begin(),
-                 test::equivalent));
+    if (BOOST_TEST_EQ(values1.size(), values2.size())) {
+      BOOST_TEST_ALL_WITH(values1.begin(), values1.end(), values2.begin(),
+        values2.end(), test::equivalent);
+    }
   }
 
   template <class X1, class X2, class T>