1 files changed, 12 insertions, 2 deletions
diff --git a/boost/test/unit_test_parameters.hpp b/boost/test/unit_test_parameters.hpp
index e01bbd7aed..e7e60d344f 100644
--- a/boost/test/unit_test_parameters.hpp
+++ b/boost/test/unit_test_parameters.hpp
@@ -112,11 +112,21 @@ public:
 
         if( stream_name == "stderr" ) {
             m_stream = &std::cerr;
-            m_cleaner.reset();
+            if(cleaner_callback) {
+                m_cleaner = boost::make_shared<callback_cleaner>(cleaner_callback);
+            }
+            else {
+                m_cleaner.reset();
+            }
         }
         else if( stream_name == "stdout" ) {
             m_stream = &std::cout;
-            m_cleaner.reset();
+            if (cleaner_callback) {
+                m_cleaner = boost::make_shared<callback_cleaner>(cleaner_callback);
+            }
+            else {
+                m_cleaner.reset();
+            }
         }
         else {
             m_cleaner = boost::make_shared<callback_cleaner>(cleaner_callback);