diff --git a/test/diagnostic_info_test2.cpp b/test/diagnostic_info_test2.cpp
index 32089d37..8c9c0f18 100644
--- a/test/diagnostic_info_test2.cpp
+++ b/test/diagnostic_info_test2.cpp
@@ -59,7 +59,7 @@ int main()
             st << di;
             std::string s = st.str();
             std::cout << s << std::endl;
-            if( BOOST_LEAF_CFG_DIAGNOSTICS )
+            if( BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_CAPTURE )
                 BOOST_TEST_NE(s.find("info<2>"), s.npos);
 #endif
         } );
@@ -95,7 +95,7 @@ int main()
             st << di;
             std::string s = st.str();
             std::cout << s << std::endl;
-            if( BOOST_LEAF_CFG_DIAGNOSTICS )
+            if( BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_CAPTURE )
                 BOOST_TEST_NE(s.find("info<2>"), s.npos);
 #endif
         } );
@@ -131,7 +131,7 @@ int main()
             st << di;
             std::string s = st.str();
             std::cout << s << std::endl;
-            if( BOOST_LEAF_CFG_DIAGNOSTICS )
+            if( BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_CAPTURE )
                 BOOST_TEST_NE(s.find("info<2>"), s.npos);
 #endif
         } );
diff --git a/test/diagnostic_info_test3.cpp b/test/diagnostic_info_test3.cpp
index 2de8e833..5af33bdd 100644
--- a/test/diagnostic_info_test3.cpp
+++ b/test/diagnostic_info_test3.cpp
@@ -48,7 +48,7 @@ int main()
             st << di;
             std::string s = st.str();
             std::cout << s << std::endl;
-            if( BOOST_LEAF_CFG_DIAGNOSTICS )
+            if( BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_CAPTURE )
             {
                 BOOST_TEST_NE(s.find("41"), s.npos);
                 BOOST_TEST_EQ(s.find("42"), s.npos);
diff --git a/test/diagnostic_info_test4.cpp b/test/diagnostic_info_test4.cpp
index 18a7bf47..5416b09e 100644
--- a/test/diagnostic_info_test4.cpp
+++ b/test/diagnostic_info_test4.cpp
@@ -63,7 +63,7 @@ int main()
         st << e;
         std::string s = st.str();
         std::cout << s << std::endl;
-        if( BOOST_LEAF_CFG_DIAGNOSTICS )
+        if( BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_CAPTURE )
         {
             BOOST_TEST_NE(s.find("new_error"), s.npos);
             BOOST_TEST_NE(s.find("appended: 42"), s.npos);
diff --git a/test/diagnostic_info_test5.cpp b/test/diagnostic_info_test5.cpp
index 142c1d79..d945e4f0 100644
--- a/test/diagnostic_info_test5.cpp
+++ b/test/diagnostic_info_test5.cpp
@@ -94,7 +94,7 @@ int main()
             st << di;
             std::string s = st.str();
             std::cout << s << std::endl;
-            if( BOOST_LEAF_CFG_DIAGNOSTICS )
+            if( BOOST_LEAF_CFG_DIAGNOSTICS && BOOST_LEAF_CFG_CAPTURE )
             {
                 auto const n1 = s.find("info<1>: acc=0");
                 auto const n2 = s.find("info<2>: acc=0");