diff --git a/webrtc/build/tsan_suppressions.cc b/webrtc/build/tsan_suppressions.cc
index 4002d3c2ff..aac640de59 100644
--- a/webrtc/build/tsan_suppressions.cc
+++ b/webrtc/build/tsan_suppressions.cc
@@ -65,7 +65,6 @@ char kTSanDefaultSuppressions[] =
 "deadlock:webrtc::ProcessThreadImpl::RegisterModule\n"
 "deadlock:webrtc::RTCPReceiver::SetSsrcs\n"
 "deadlock:webrtc::RTPSenderAudio::RegisterAudioPayload\n"
-"deadlock:webrtc/system_wrappers/source/logging_unittest.cc\n"
 "deadlock:webrtc::test::UdpSocketManagerPosixImpl::RemoveSocket\n"
 "deadlock:webrtc::vcm::VideoReceiver::RegisterPacketRequestCallback\n"
 "deadlock:webrtc::VideoSendStreamTest_SuspendBelowMinBitrate_Test::TestBody\n"
diff --git a/webrtc/system_wrappers/source/logging_unittest.cc b/webrtc/system_wrappers/source/logging_unittest.cc
index 19f13940cc..d1eab32e4b 100644
--- a/webrtc/system_wrappers/source/logging_unittest.cc
+++ b/webrtc/system_wrappers/source/logging_unittest.cc
@@ -51,17 +51,16 @@ class LoggingTest : public ::testing::Test, public TraceCallback {
   }
 
   void TearDown() {
-    CriticalSectionScoped cs(crit_.get());
     Trace::SetTraceCallback(NULL);
     Trace::ReturnTrace();
+    CriticalSectionScoped cs(crit_.get());
     ASSERT_EQ(kTraceNone, level_) << "Print() was not called";
   }
 
   scoped_ptr<CriticalSectionWrapper> crit_;
   scoped_ptr<ConditionVariableWrapper> cv_;
-  TraceLevel level_;
-  int length_;
-  std::ostringstream expected_log_;
+  TraceLevel level_ GUARDED_BY(crit_);
+  std::ostringstream expected_log_ GUARDED_BY(crit_);
 };
 
 TEST_F(LoggingTest, LogStream) {