diff --git a/src/video_engine/test/auto_test/source/vie_autotest_base.cc b/src/video_engine/test/auto_test/source/vie_autotest_base.cc
index 4e12c99d4d..d2a29b2513 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_base.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_base.cc
@@ -189,7 +189,11 @@ void ViEAutoTest::ViEBaseAPITest() {
       "Should fail: disconnecting bogus channel";
 
   EXPECT_EQ(0, ptrViEBase->DisconnectAudioChannel(videoChannel));
+
+  // Clean up voice engine
   EXPECT_EQ(0, ptrViEBase->SetVoiceEngine(NULL));
+  EXPECT_EQ(0, ptrVoEBase->Release());
+  EXPECT_TRUE(webrtc::VoiceEngine::Delete(ptrVoE));
 
   webrtc::ViEBase* ptrViEBase2 = webrtc::ViEBase::GetInterface(ptrViE);
   EXPECT_TRUE(NULL != ptrViEBase2);
diff --git a/src/video_engine/test/auto_test/source/vie_autotest_file.cc b/src/video_engine/test/auto_test/source/vie_autotest_file.cc
index afb73685f8..4e87554d73 100644
--- a/src/video_engine/test/auto_test/source/vie_autotest_file.cc
+++ b/src/video_engine/test/auto_test/source/vie_autotest_file.cc
@@ -463,6 +463,12 @@ void ViEAutoTest::ViEFileStandardTest()
         //	Testing finished. Tear down Video Engine
         //***************************************************************
 
+        EXPECT_EQ(0, ptrViEBase->DisconnectAudioChannel(videoChannel));
+        EXPECT_EQ(0, ptrViEBase->SetVoiceEngine(NULL));
+        EXPECT_EQ(0, ptrVEBase->DeleteChannel(audioChannel));
+        EXPECT_EQ(0, ptrVEBase->Release());
+        EXPECT_EQ(0, ptrVECodec->Release());
+        EXPECT_TRUE(webrtc::VoiceEngine::Delete(ptrVEEngine));
 
         EXPECT_EQ(0, ptrViEBase->StopReceive(videoChannel));
         EXPECT_EQ(0, ptrViEBase->StopSend(videoChannel));
diff --git a/src/video_engine/vie_base_impl.h b/src/video_engine/vie_base_impl.h
index f6a30fb041..a961405139 100644
--- a/src/video_engine/vie_base_impl.h
+++ b/src/video_engine/vie_base_impl.h
@@ -31,7 +31,8 @@ class ViEBaseImpl
   // Initializes VideoEngine and must be called before any other API is called.
   virtual int Init();
 
-  // Connects ViE to a VoE instance.
+  // Connects ViE to a VoE instance. Pass in NULL to forget about a previously
+  // set voice engine and release all resources we allocated from it.
   virtual int SetVoiceEngine(VoiceEngine* voice_engine);
 
   // Creates a new ViE channel.