2 files changed, 5 insertions, 3 deletions
diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/StatsTestUtil.java b/impl_core/src/test/java/io/opencensus/implcore/stats/StatsTestUtil.java
index 848fdd7b..1d57dbe2 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/stats/StatsTestUtil.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/stats/StatsTestUtil.java
@@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import javax.annotation.Nullable;
 
 /** Stats test utilities. */
@@ -76,8 +77,9 @@ final class StatsTestUtil {
       Map<? extends List<? extends TagValue>, ? extends AggregationData> expected,
       double tolerance) {
     assertThat(actual.keySet()).containsExactlyElementsIn(expected.keySet());
-    for (List<? extends TagValue> tagValues : actual.keySet()) {
-      assertAggregationDataEquals(expected.get(tagValues), actual.get(tagValues), tolerance);
+    for (Entry<? extends List<? extends TagValue>, ? extends AggregationData> entry :
+        actual.entrySet()) {
+      assertAggregationDataEquals(expected.get(entry.getKey()), entry.getValue(), tolerance);
     }
   }
 
diff --git a/impl_core/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java
index cfbd6735..2ec0da1a 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/stats/ViewManagerImplTest.java
@@ -97,7 +97,7 @@ public class ViewManagerImplTest {
   private static final Cumulative CUMULATIVE = Cumulative.create();
 
   private static final double EPSILON = 1e-7;
-  private static final int MILLIS_PER_SECOND = 1000;
+  private static final long MILLIS_PER_SECOND = 1000;
   private static final Duration TEN_SECONDS = Duration.create(10, 0);
   private static final Interval INTERVAL = Interval.create(TEN_SECONDS);