diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index 39d154b13..3265ff939 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -140,6 +140,7 @@ void EncoderTest::RunLoop(VideoSource *video) {
 
   stats_.Reset();
 
+  ASSERT_TRUE(passes_ == 1 || passes_ == 2);
   for (unsigned int pass = 0; pass < passes_; pass++) {
     last_pts_ = 0;
 
diff --git a/test/tile_independence_test.cc b/test/tile_independence_test.cc
index c9f82ef88..acff0fdfb 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -45,6 +45,7 @@ class TileIndependenceTest : public ::libvpx_test::EncoderTest,
 
   virtual void SetUp() {
     InitializeConfig();
+    SetMode(libvpx_test::kTwoPassGood);
   }
 
   virtual void PreEncodeFrameHook(libvpx_test::VideoSource *video,