diff --git a/webrtc/base/checks.h b/webrtc/base/checks.h
index fc3b329328..821b75be17 100644
--- a/webrtc/base/checks.h
+++ b/webrtc/base/checks.h
@@ -154,7 +154,7 @@ DEFINE_CHECK_OP_IMPL(GT, > )
 
 // The DCHECK macro is equivalent to CHECK except that it only generates code in
 // debug builds.
-#if !defined(NDEBUG)
+#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
 #define DCHECK(condition) CHECK(condition)
 #define DCHECK_EQ(v1, v2) CHECK_EQ(v1, v2)
 #define DCHECK_NE(v1, v2) CHECK_NE(v1, v2)
diff --git a/webrtc/base/thread_checker_unittest.cc b/webrtc/base/thread_checker_unittest.cc
index dcaf75b6ea..87e69c035a 100644
--- a/webrtc/base/thread_checker_unittest.cc
+++ b/webrtc/base/thread_checker_unittest.cc
@@ -10,9 +10,8 @@
 
 // Borrowed from Chromium's src/base/threading/thread_checker_unittest.cc.
 
-#include <assert.h>
-
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/base/scoped_ptr.h"
@@ -38,7 +37,7 @@ class ThreadCheckerClass : public ThreadChecker {
 
   // Verifies that it was called on the same thread as the constructor.
   void DoStuff() {
-    assert(CalledOnValidThread());
+    DCHECK(CalledOnValidThread());
   }
 
   void DetachFromThread() {