diff --git a/examples/androidtests/AndroidManifest.xml b/examples/androidtests/AndroidManifest.xml
index 7cd52bc531..7ce02dc415 100644
--- a/examples/androidtests/AndroidManifest.xml
+++ b/examples/androidtests/AndroidManifest.xml
@@ -20,8 +20,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         tools:ignore="MissingPrefix"
         android:targetPackage="org.appspot.apprtc"
-        android:label="Tests for AppRTCMobile"/>
+        android:label="Tests for AppRTCMobile"
+        chromium-junit4="true"/>
 </manifest>
diff --git a/sdk/android/instrumentationtests/AndroidManifest.xml b/sdk/android/instrumentationtests/AndroidManifest.xml
index 75df968f13..591932c38e 100644
--- a/sdk/android/instrumentationtests/AndroidManifest.xml
+++ b/sdk/android/instrumentationtests/AndroidManifest.xml
@@ -31,8 +31,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- tools:ignore needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
     <instrumentation android:name="org.chromium.base.test.BaseChromiumAndroidJUnitRunner"
         tools:ignore="MissingPrefix"
         android:targetPackage="org.webrtc"
-        android:label="Tests for WebRTC Android SDK"/>
+        android:label="Tests for WebRTC Android SDK"
+        chromium-junit4="true"/>
 </manifest>
diff --git a/test/android/AndroidManifest.xml b/test/android/AndroidManifest.xml
index c1ddfd4a02..f8eb2e500c 100644
--- a/test/android/AndroidManifest.xml
+++ b/test/android/AndroidManifest.xml
@@ -41,7 +41,6 @@ be found in the AUTHORS file in the root of the source tree.
 
     <instrumentation android:name="org.chromium.native_test.NativeTestInstrumentationTestRunner"
             android:targetPackage="org.webrtc.native_test"
-            android:label="Instrumentation entry point for org.webrtc.native_test"
-            chromium-junit3="true"/>
+            android:label="Instrumentation entry point for org.webrtc.native_test"/>
 
 </manifest>