diff --git a/AUTHORS b/AUTHORS
index 5ea751bbc..466779f6d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -143,6 +143,7 @@ Feng Ma
 Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
+Fraser Stark
 Gabriel Landau
 Gabriel Reis
 Garvit Shubham
diff --git a/src/_pytest/warning_types.py b/src/_pytest/warning_types.py
index 31726e1ce..4219f1439 100644
--- a/src/_pytest/warning_types.py
+++ b/src/_pytest/warning_types.py
@@ -61,7 +61,7 @@ class PytestRemovedIn9Warning(PytestDeprecationWarning):
     __module__ = "pytest"
 
 
-class PytestReturnNotNoneWarning(PytestRemovedIn8Warning):
+class PytestReturnNotNoneWarning(PytestWarning):
     """Warning emitted when a test function is returning value other than None."""
 
     __module__ = "pytest"