diff --git a/build_runner/lib/src/generate/watch_impl.dart b/build_runner/lib/src/generate/watch_impl.dart
index 37cfdc7c0..4c24be407 100644
--- a/build_runner/lib/src/generate/watch_impl.dart
+++ b/build_runner/lib/src/generate/watch_impl.dart
@@ -306,7 +306,7 @@ class WatchImpl implements BuildState {
 
 Map<AssetId, ChangeType> _collectChanges(List<List<AssetChange>> changes) {
   var changeMap = <AssetId, ChangeType>{};
-  for (var change in changes.expand((l) => l)) {
+  for (AssetChange change in changes.expand((l) => l)) {
     var originalChangeType = changeMap[change.id];
     if (originalChangeType != null) {
       switch (originalChangeType) {
diff --git a/build_runner/test/common/test_phases.dart b/build_runner/test/common/test_phases.dart
index 13ae161a5..5c2ebe312 100644
--- a/build_runner/test/common/test_phases.dart
+++ b/build_runner/test/common/test_phases.dart
@@ -144,7 +144,7 @@ void checkBuild(BuildResult result,
 
   final unhiddenOutputs = <String, dynamic>{};
   final unhiddenAssets = new Set<AssetId>();
-  for (final id in outputs?.keys ?? const []) {
+  for (final String id in outputs?.keys ?? const []) {
     if (id.startsWith(r'$$')) {
       final unhidden = id.substring(2);
       unhiddenAssets.add(makeAssetId(unhidden));
diff --git a/build_runner/test/generate/build_definition_test.dart b/build_runner/test/generate/build_definition_test.dart
index 57bd0ceaa..12463a258 100644
--- a/build_runner/test/generate/build_definition_test.dart
+++ b/build_runner/test/generate/build_definition_test.dart
@@ -214,7 +214,7 @@ main() {
             environment.reader);
         var generatedACopyId = makeAssetId('a|lib/a.txt.copy');
         var generatedACloneId = makeAssetId('a|lib/a.txt.clone');
-        for (var id in [generatedACopyId, generatedACloneId]) {
+        for (AssetId id in [generatedACopyId, generatedACloneId]) {
           var node = originalAssetGraph.get(id) as GeneratedAssetNode;
           node.wasOutput = true;
           node.needsUpdate = false;