diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index a462b4c..d909041 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -86,6 +86,10 @@ done
 # several other packages expect to find the JARs there
 %mvn_file ":{*}" httpcomponents/@1
 
+# tests fail with OpenJDK 21 due to mocking of sealed classes
+sed -i '/testRequestTargetHostFallback()/i@org.junit.Ignore' httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
+rm httpcore-nio/src/test/java/org/apache/http/impl/nio/TestContentChannel.java
+
 %build
 %mvn_build -- -Dmaven.compiler.release=8
 
@@ -97,6 +101,10 @@ done
 %doc README.txt RELEASE_NOTES.txt
 
 %changelog
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.16-8
+- Port to OpenJDK 21
+- Resolves: RHEL-52711
+
 * Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 4.4.16-8
 - Bump release for Aug 2024 java mass rebuild