diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index b27a527477..6ab40a66ad 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -415,6 +415,13 @@ class PortTest : public ::testing::Test, public sigslot::has_slots<> {
         role_conflict_(false),
         ports_destroyed_(0) {}
 
+  ~PortTest() {
+    // Workaround for tests that trigger async destruction of objects that we
+    // need to give an opportunity here to run, before proceeding with other
+    // teardown.
+    rtc::Thread::Current()->ProcessMessages(0);
+  }
+
  protected:
   std::string password() { return password_; }
 
diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc
index aaf6c19b82..307d499255 100644
--- a/rtc_base/thread.cc
+++ b/rtc_base/thread.cc
@@ -1223,11 +1223,6 @@ AutoSocketServerThread::AutoSocketServerThread(SocketServer* ss)
 
 AutoSocketServerThread::~AutoSocketServerThread() {
   RTC_DCHECK(ThreadManager::Instance()->CurrentThread() == this);
-  // Some tests post destroy messages to this thread. To avoid memory
-  // leaks, we have to process those messages. In particular
-  // P2PTransportChannelPingTest, relying on the message posted in
-  // cricket::Connection::Destroy.
-  ProcessMessages(0);
   // Stop and destroy the thread before clearing it as the current thread.
   // Sometimes there are messages left in the Thread that will be
   // destroyed by DoDestroy, and sometimes the destructors of the message and/or