diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java
index eb72b963e0b..dc9b51d20d1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntityTest.java
@@ -27,7 +27,7 @@ import org.robolectric.RobolectricTestRunner;
 public final class AppUsageEventEntityTest {
     @Test
     public void testBuilder_returnsExpectedResult() {
-        final long uid = 101L;
+        final int uid = 101;
         final long userId = 1001L;
         final long timestamp = 10001L;
         final int appUsageEventType = 1;
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
index 915231f2573..10b17a7b862 100644
--- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
@@ -169,7 +169,7 @@ public class BatteryTestUtils {
             Context context, long userId, long timestamp, String packageName, boolean multiple) {
         final AppUsageEventEntity entity =
                 new AppUsageEventEntity(
-                        /* uid= */ 101L,
+                        /* uid= */ 101,
                         userId,
                         timestamp,
                         /* appUsageEventType= */ 2,