diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index e331debe65..ae21837267 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -1552,7 +1552,7 @@ function check_javac
         > "${PATCH_DIR}/diffJavacWarnings.txt"
 
         add_jira_table -1 javac "The applied patch generated "\
-        "$((patchJavacWarnings-${PATCH_BRANCH}JavacWarnings))" \
+        "$((patchJavacWarnings-branchJavacWarnings))" \
         " additional warning messages."
 
         add_jira_footer javac "@@BASE@@/diffJavacWarnings.txt"
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 1783e8df83..39d14c9feb 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -576,6 +576,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11870. [JDK8] AuthenticationFilter, CertificateUtil,
     SignerSecretProviders, KeyAuthorizationKeyProvider Javadoc issues (rkanter)
 
+    HADOOP-11881. test-patch.sh javac result is wildly wrong (Kengo Seki via
+    aw)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES