diff --git a/webrtc/api/peerconnectionendtoend_unittest.cc b/webrtc/api/peerconnectionendtoend_unittest.cc
index be662886d3..20df17bc63 100644
--- a/webrtc/api/peerconnectionendtoend_unittest.cc
+++ b/webrtc/api/peerconnectionendtoend_unittest.cc
@@ -17,6 +17,7 @@
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/ssladapter.h"
+#include "webrtc/base/thread.h"
 #include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
@@ -46,11 +47,12 @@ class PeerConnectionEndToEndTest
   typedef std::vector<rtc::scoped_refptr<DataChannelInterface> >
       DataChannelList;
 
-  PeerConnectionEndToEndTest()
-      : caller_(new rtc::RefCountedObject<PeerConnectionTestWrapper>(
-                    "caller")),
-        callee_(new rtc::RefCountedObject<PeerConnectionTestWrapper>(
-                    "callee")) {
+  PeerConnectionEndToEndTest() {
+    RTC_CHECK(worker_thread_.Start());
+    caller_ = new rtc::RefCountedObject<PeerConnectionTestWrapper>(
+        "caller", &worker_thread_);
+    callee_ = new rtc::RefCountedObject<PeerConnectionTestWrapper>(
+        "callee", &worker_thread_);
 #ifdef WEBRTC_ANDROID
     webrtc::InitializeAndroidObjects();
 #endif
@@ -151,6 +153,7 @@ class PeerConnectionEndToEndTest
   }
 
  protected:
+  rtc::Thread worker_thread_;
   rtc::scoped_refptr<PeerConnectionTestWrapper> caller_;
   rtc::scoped_refptr<PeerConnectionTestWrapper> callee_;
   DataChannelList caller_signaled_data_channels_;
diff --git a/webrtc/api/test/peerconnectiontestwrapper.cc b/webrtc/api/test/peerconnectiontestwrapper.cc
index 2ff9b5d009..038980ce56 100644
--- a/webrtc/api/test/peerconnectiontestwrapper.cc
+++ b/webrtc/api/test/peerconnectiontestwrapper.cc
@@ -47,15 +47,16 @@ void PeerConnectionTestWrapper::Connect(PeerConnectionTestWrapper* caller,
       caller, &PeerConnectionTestWrapper::ReceiveAnswerSdp);
 }
 
-PeerConnectionTestWrapper::PeerConnectionTestWrapper(const std::string& name)
-    : name_(name) {}
+PeerConnectionTestWrapper::PeerConnectionTestWrapper(const std::string& name,
+                                                     rtc::Thread* worker_thread)
+    : name_(name), worker_thread_(worker_thread) {}
 
 PeerConnectionTestWrapper::~PeerConnectionTestWrapper() {}
 
 bool PeerConnectionTestWrapper::CreatePc(
   const MediaConstraintsInterface* constraints) {
   rtc::scoped_ptr<cricket::PortAllocator> port_allocator(
-      new cricket::FakePortAllocator(rtc::Thread::Current(), nullptr));
+      new cricket::FakePortAllocator(worker_thread_, nullptr));
 
   fake_audio_capture_module_ = FakeAudioCaptureModule::Create();
   if (fake_audio_capture_module_ == NULL) {
@@ -63,8 +64,8 @@ bool PeerConnectionTestWrapper::CreatePc(
   }
 
   peer_connection_factory_ = webrtc::CreatePeerConnectionFactory(
-      rtc::Thread::Current(), rtc::Thread::Current(),
-      fake_audio_capture_module_, NULL, NULL);
+      worker_thread_, rtc::Thread::Current(), fake_audio_capture_module_, NULL,
+      NULL);
   if (!peer_connection_factory_) {
     return false;
   }
diff --git a/webrtc/api/test/peerconnectiontestwrapper.h b/webrtc/api/test/peerconnectiontestwrapper.h
index 25510b2de0..f744b57c22 100644
--- a/webrtc/api/test/peerconnectiontestwrapper.h
+++ b/webrtc/api/test/peerconnectiontestwrapper.h
@@ -25,7 +25,8 @@ class PeerConnectionTestWrapper
   static void Connect(PeerConnectionTestWrapper* caller,
                       PeerConnectionTestWrapper* callee);
 
-  explicit PeerConnectionTestWrapper(const std::string& name);
+  explicit PeerConnectionTestWrapper(const std::string& name,
+                                     rtc::Thread* worker_thread);
   virtual ~PeerConnectionTestWrapper();
 
   bool CreatePc(const webrtc::MediaConstraintsInterface* constraints);
@@ -88,6 +89,7 @@ class PeerConnectionTestWrapper
       bool video, const webrtc::FakeConstraints& video_constraints);
 
   std::string name_;
+  rtc::Thread* worker_thread_;
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
   rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
       peer_connection_factory_;