diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
index ee64b746653..887f865547a 100644
--- a/firebase-common/firebase-common.gradle
+++ b/firebase-common/firebase-common.gradle
@@ -76,13 +76,13 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
     androidTestImplementation 'org.mockito:mockito-core:2.21.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.16.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.16.0'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.25.0'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.25.0'
     androidTestImplementation ('com.google.firebase:firebase-auth:17.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
 
-    androidTestImplementation ('com.google.firebase:firebase-core:16.0.4') {
+    androidTestImplementation ('com.google.firebase:firebase-core:16.0.9') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
 
diff --git a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java
index b40459deb09..dd5aafff4fa 100644
--- a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java
+++ b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java
@@ -142,9 +142,10 @@ public void testInitializeApp_shouldPublishVersionForFirebaseCommon() {
 
     // After sorting the user agents are expected to be {"fire-android/", "fire-auth/x.y.z",
     // "fire-core/x.y.z", "test-component/1.2.3"}
-    assertThat(actualUserAgent[0]).contains("fire-android");
-    assertThat(actualUserAgent[1]).contains("fire-auth");
-    assertThat(actualUserAgent[2]).contains("fire-core");
+    assertThat(actualUserAgent[0]).contains("fire-analytics");
+    assertThat(actualUserAgent[1]).contains("fire-android");
+    assertThat(actualUserAgent[2]).contains("fire-auth");
+    assertThat(actualUserAgent[3]).contains("fire-core");
   }
 
   @Test