diff --git a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java
index a9605c103df..6a56ef231d1 100644
--- a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java
+++ b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageTest.java
@@ -35,12 +35,13 @@
 @RunWith(AndroidJUnit4.class)
 public class HeartBeatInfoStorageTest {
   private final Preferences.Key<Long> testSdk = PreferencesKeys.longKey("testSdk");
-  private final Preferences.Key<Long> GLOBAL = PreferencesKeys.longKey("fire-global");
+  private static final Preferences.Key<Long> GLOBAL = PreferencesKeys.longKey("fire-global");
   private static final int HEART_BEAT_COUNT_LIMIT = 30;
-  private static Context applicationContext = ApplicationProvider.getApplicationContext();
-  private static JavaDataStorage heartBeatDataStore =
+  private static final Context applicationContext = ApplicationProvider.getApplicationContext();
+  private static final JavaDataStorage heartBeatDataStore =
       new JavaDataStorage(applicationContext, "testHeartBeat");
-  private HeartBeatInfoStorage heartBeatInfoStorage = new HeartBeatInfoStorage(heartBeatDataStore);
+  private final HeartBeatInfoStorage heartBeatInfoStorage =
+      new HeartBeatInfoStorage(heartBeatDataStore);
 
   @Before
   public void setUp() {