diff --git a/webrtc/modules/audio_coding/main/test/TestVADDTX.cc b/webrtc/modules/audio_coding/main/test/TestVADDTX.cc
index 06e795142..1e05be264 100644
--- a/webrtc/modules/audio_coding/main/test/TestVADDTX.cc
+++ b/webrtc/modules/audio_coding/main/test/TestVADDTX.cc
@@ -121,13 +121,13 @@ void TestVADDTX::Perform() {
 }
 
 void TestVADDTX::runTestCases() {
-  // #1 DTX = OFF, VAD = ON, VADNormal
-  SetVAD(false, true, VADNormal);
+  // #1 DTX = OFF, VAD = OFF, VADNormal
+  SetVAD(false, false, VADNormal);
   Run();
   VerifyTest();
 
-  // #2 DTX = OFF, VAD = ON, VADAggr
-  SetVAD(false, true, VADAggr);
+  // #2 DTX = ON, VAD = ON, VADAggr
+  SetVAD(true, true, VADAggr);
   Run();
   VerifyTest();
 
@@ -141,8 +141,8 @@ void TestVADDTX::runTestCases() {
   Run();
   VerifyTest();
 
-  // #5 DTX = ON, VAD = OFF, VADNormal
-  SetVAD(true, false, VADNormal);
+  // #5 DTX = ON, VAD = ON, VADNormal
+  SetVAD(true, true, VADNormal);
   Run();
   VerifyTest();
 }
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index cf9e733d4..745ac9e90 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -1352,6 +1352,7 @@ Channel::SetVADStatus(bool enableVAD, ACMVADMode mode, bool disableDTX)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
                  "Channel::SetVADStatus(mode=%d)", mode);
+    assert(!(disableDTX && enableVAD));  // disableDTX mode is deprecated.
     // To disable VAD, DTX must be disabled too
     disableDTX = ((enableVAD == false) ? true : disableDTX);
     if (audio_coding_->SetVAD(!disableDTX, enableVAD, mode) != 0)
diff --git a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc
index 3b56bae54..3460f0a5c 100644
--- a/webrtc/voice_engine/test/auto_test/standard/codec_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/codec_test.cc
@@ -97,16 +97,17 @@ TEST_F(CodecTest, VoiceActivityDetectionTypeSettingsCanBeChanged) {
   EXPECT_EQ(vad_mode, webrtc::kVadAggressiveMid);
   EXPECT_FALSE(dtx_disabled);
 
-  // The fourth argument is the DTX disable flag.
-  EXPECT_EQ(0, voe_codec_->SetVADStatus(
-      channel_, true, webrtc::kVadAggressiveHigh, true));
+  // The fourth argument is the DTX disable flag, which is always supposed to
+  // be false.
+  EXPECT_EQ(0, voe_codec_->SetVADStatus(channel_, true,
+                                        webrtc::kVadAggressiveHigh, false));
   EXPECT_EQ(0, voe_codec_->GetVADStatus(
       channel_, vad_enabled, vad_mode, dtx_disabled));
   EXPECT_EQ(vad_mode, webrtc::kVadAggressiveHigh);
-  EXPECT_TRUE(dtx_disabled);
+  EXPECT_FALSE(dtx_disabled);
 
-  EXPECT_EQ(0, voe_codec_->SetVADStatus(
-      channel_, true, webrtc::kVadConventional, true));
+  EXPECT_EQ(0, voe_codec_->SetVADStatus(channel_, true,
+                                        webrtc::kVadConventional, false));
   EXPECT_EQ(0, voe_codec_->GetVADStatus(
       channel_, vad_enabled, vad_mode, dtx_disabled));
   EXPECT_EQ(vad_mode, webrtc::kVadConventional);