diff --git a/libi2pd/TunnelPool.cpp b/libi2pd/TunnelPool.cpp
index 550a75c5..5b472232 100644
--- a/libi2pd/TunnelPool.cpp
+++ b/libi2pd/TunnelPool.cpp
@@ -364,36 +364,24 @@ namespace tunnel
 		{
 			std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex);
 			for (auto& it: m_OutboundTunnels)
-				outboundTunnels.push_back (it);
+				if (it->IsEstablished () || it->GetState () == eTunnelStateTestFailed)
+					outboundTunnels.push_back (it);
 		}
 		std::shuffle (outboundTunnels.begin(), outboundTunnels.end(), m_Rng);
 		std::vector<std::shared_ptr<InboundTunnel> > inboundTunnels;
 		{
 			std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);
 			for (auto& it: m_InboundTunnels)
-				inboundTunnels.push_back (it);
+				if (it->IsEstablished () || it->GetState () == eTunnelStateTestFailed)
+					inboundTunnels.push_back (it);
 		}
 		std::shuffle (inboundTunnels.begin(), inboundTunnels.end(), m_Rng);
 		auto it1 = outboundTunnels.begin ();
 		auto it2 = inboundTunnels.begin ();
 		while (it1 != outboundTunnels.end () && it2 != inboundTunnels.end ())
 		{
-			bool failed = false;
-			if ((*it1)->IsFailed ())
-			{
-				failed = true;
-				++it1;
-			}
-			if ((*it2)->IsFailed ())
-			{
-				failed = true;
-				++it2;
-			}
-			if (!failed)
-			{
-				newTests.push_back(std::make_pair (*it1, *it2));
-				++it1; ++it2;
-			}
+			newTests.push_back(std::make_pair (*it1, *it2));
+			++it1; ++it2;
 		}
 		for (auto& it: newTests)
 		{