diff --git a/webrtc/examples/androidtests/AndroidManifest.xml b/webrtc/examples/androidtests/AndroidManifest.xml
index 3df2c693e0..d5de7fc134 100644
--- a/webrtc/examples/androidtests/AndroidManifest.xml
+++ b/webrtc/examples/androidtests/AndroidManifest.xml
@@ -21,7 +21,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- Needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
+    <!--suppress MissingPrefix -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         android:targetPackage="org.appspot.apprtc"
-        android:label="Tests for AppRTCMobile"/>
+        android:label="Tests for AppRTCMobile"
+        chromium-junit4="true"/>
 </manifest>
diff --git a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
index 15c9e6779e..c83fea8c54 100644
--- a/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
+++ b/webrtc/sdk/android/instrumentationtests/AndroidManifest.xml
@@ -30,7 +30,11 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- Needed for chromium-junit4 tag. crbug.com/640116
+         TODO(sakal): Remove once the tag is no longer needed. -->
+    <!--suppress MissingPrefix -->
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
         android:targetPackage="org.webrtc"
-        android:label="Tests for WebRTC Android SDK"/>
+        android:label="Tests for WebRTC Android SDK"
+        chromium-junit4="true"/>
 </manifest>