diff --git a/src/voice_engine/main/test/auto_test/voe_test_defines.h b/src/voice_engine/main/test/auto_test/voe_test_defines.h
index c9c103a33c..9fff35b183 100644
--- a/src/voice_engine/main/test/auto_test/voe_test_defines.h
+++ b/src/voice_engine/main/test/auto_test/voe_test_defines.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -21,6 +21,7 @@
     __android_log_print(ANDROID_LOG_DEBUG, ANDROID_LOG_TAG, __VA_ARGS__)
 #define TEST_LOG_ERROR(...) \
     __android_log_print(ANDROID_LOG_ERROR, ANDROID_LOG_TAG, __VA_ARGS__)
+#define TEST_LOG_FLUSH
 #else
 #define TEST_LOG printf
 #define TEST_LOG_ERROR printf
diff --git a/src/voice_engine/main/test/voice_engine_tests.gypi b/src/voice_engine/main/test/voice_engine_tests.gypi
index ad78912896..db108babfd 100644
--- a/src/voice_engine/main/test/voice_engine_tests.gypi
+++ b/src/voice_engine/main/test/voice_engine_tests.gypi
@@ -67,6 +67,14 @@
         'auto_test/voe_unit_test.cc',
         'auto_test/voe_unit_test.h',
       ],
+      'conditions': [
+        ['OS=="android"', {
+          # some tests are not supported on android yet, exclude these tests.
+          'sources!': [
+            'auto_test/standard/hardware_before_streaming_test.cc',
+          ],
+        }],
+      ],
     },
     {
       # command line test that should work on linux/mac/win