diff --git a/test/core/diagnoses_test.py b/test/core/diagnoses_test.py
index 032c69c6a..25814dfec 100644
--- a/test/core/diagnoses_test.py
+++ b/test/core/diagnoses_test.py
@@ -198,7 +198,7 @@ class DiagnoserTest(unittest.TestCase):
 
   def test_phase_diagnoser_name_from_function(self):
 
-    @htf.PhaseDiagnoser(OkayResult.OKAY)
+    @htf.PhaseDiagnoser(OkayResult.OKAY)  # pytype: disable=wrong-arg-types  # use-enum-overlay
     def from_function(phase_record):
       del phase_record  # Unused.
       return None
@@ -207,7 +207,7 @@ def from_function(phase_record):
 
   def test_phase_diagnoser_name_set(self):
 
-    @htf.PhaseDiagnoser(OkayResult.OKAY, name='from_arg')
+    @htf.PhaseDiagnoser(OkayResult.OKAY, name='from_arg')  # pytype: disable=wrong-arg-types  # use-enum-overlay
     def from_function(phase_record):
       del phase_record  # Unused.
       return None
@@ -230,7 +230,7 @@ def unused_diag(phase_record):
 
   def test_test_diagnoser_name_from_function(self):
 
-    @htf.TestDiagnoser(OkayResult.OKAY)
+    @htf.TestDiagnoser(OkayResult.OKAY)  # pytype: disable=wrong-arg-types  # use-enum-overlay
     def from_function(test_record_, store):
       del test_record_  # Unused.
       del store  # Unused.
@@ -240,7 +240,7 @@ def from_function(test_record_, store):
 
   def test_test_diagnoser_name_set(self):
 
-    @htf.TestDiagnoser(OkayResult.OKAY, name='from_arg')
+    @htf.TestDiagnoser(OkayResult.OKAY, name='from_arg')  # pytype: disable=wrong-arg-types  # use-enum-overlay
     def from_function(test_record_, store):
       del test_record_  # Unused.
       del store  # Unused.
diff --git a/test/core/phase_collections_test.py b/test/core/phase_collections_test.py
index 3704b7b57..abb1ca793 100644
--- a/test/core/phase_collections_test.py
+++ b/test/core/phase_collections_test.py
@@ -730,7 +730,7 @@ class _Diag(htf.DiagResultEnum):
 
     subtest = phase_collections.Subtest(
         'skip_branch', fail_subtest_phase,
-        htf.BranchSequence(_Diag.NOT_SET, error_phase), skip_phase)
+        htf.BranchSequence(_Diag.NOT_SET, error_phase), skip_phase)  # pytype: disable=wrong-arg-types  # use-enum-overlay
 
     test_rec = yield htf.Test(subtest, phase)