diff --git a/gcc/selftest-diagnostic.cc b/gcc/selftest-diagnostic.cc
index 8cf47ab304c..1a10807243e 100644
--- a/gcc/selftest-diagnostic.cc
+++ b/gcc/selftest-diagnostic.cc
@@ -69,7 +69,7 @@ bool
 test_diagnostic_context::report (diagnostic_t kind,
 				 rich_location &richloc,
 				 const diagnostic_metadata *metadata,
-				 int option,
+				 diagnostic_option_id option,
 				 const char * fmt, ...)
 {
   va_list ap;
diff --git a/gcc/selftest-diagnostic.h b/gcc/selftest-diagnostic.h
index dccad97da02..c8f67a03985 100644
--- a/gcc/selftest-diagnostic.h
+++ b/gcc/selftest-diagnostic.h
@@ -50,7 +50,7 @@ class test_diagnostic_context : public diagnostic_context
   report (diagnostic_t kind,
 	  rich_location &richloc,
 	  const diagnostic_metadata *metadata,
-	  int option,
+	  diagnostic_option_id option,
 	  const char * fmt, ...) ATTRIBUTE_GCC_DIAG(6,7);
 
   const char *test_show_locus (rich_location &richloc);