diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 3099387..fce040d 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -1412,10 +1412,6 @@ Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-d
 #
 #############################################
 
-# https://github.com/openjdk/jdk17u-dev/commit/859dda14f3f0d90294899812f5d34ea2e952a3df
-# Remove after next upstream update.
-Patch7: 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
-
 # Currently empty
 
 BuildRequires: autoconf
@@ -1870,7 +1866,6 @@ pushd %{top_level_dir_name}
 # rpmbuild.
 %patch -P1 -p1
 %patch -P6 -p1
-%patch -P7 -p1
 # Add crypto policy and FIPS support
 %patch -P1001 -p1
 # nss.cfg PKCS11 support; must come last as it also alters java.security
@@ -2505,6 +2500,11 @@ cjc.mainProgram(args)
 - Set is_ga to 0
 - Update sources to openjdk-17.0.13+1-ea.tar.xz
 - Related: RHEL-58785
+- Remove 0001-8332174-Remove-2-unpaired-RLO-Unicode-characters-in-.patch
+- Remove unicode section from rpminspect.yml, fixed instead by
+  https://gitlab.cee.redhat.com/osci/rpminspect-data-redhat/-/merge_requests/180
+  (OPENJDK-2904)
+- Related: RHEL-58785
 
 * Mon Sep 23 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.7-3
 - Sync java-17-openjdk-portable.specfile from openjdk-portable-centos-9
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 571ae26..b70b781 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -6,9 +6,3 @@ debuginfo:
     # Prevent rpminspect from complaining about intentional
     # "_find_debuginfo_opts -g" setting in spec file.
     debuginfo_sections: .debug_info .gdb_index
-
-unicode:
-    # Prevent rpminspect from complaining about illegal LEFT-TO-RIGHT
-    # OVERRIDE Unicode character that is intentionally present in this
-    # test case.
-    exclude: ^TestLayoutVsICU_jdkbase.xml$