diff --git a/make/data/charsetmapping/IBM864.c2b b/make/data/charsetmapping/IBM864.c2b
new file mode 100644
index 00000000000..87d30430496
--- /dev/null
+++ b/make/data/charsetmapping/IBM864.c2b
@@ -0,0 +1 @@
+0x25	U+0025
diff --git a/test/jdk/java/beans/XMLEncoder/Test4625418.java b/test/jdk/java/beans/XMLEncoder/Test4625418.java
index 6a1b8bbf268..485a079ad4d 100644
--- a/test/jdk/java/beans/XMLEncoder/Test4625418.java
+++ b/test/jdk/java/beans/XMLEncoder/Test4625418.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4625418 8239965
+ * @bug 4625418 8239965 8290488
  * @summary Tests XML <a href="http://download.java.net/jdk6/docs/technotes/guides/intl/encoding.doc.html">encoding</a>
  * @author Sergey Malenkov
  * @run main/timeout=360 Test4625418
@@ -107,7 +107,7 @@ public final class Test4625418 implements ExceptionListener {
         "Cp861",
         "Cp862",
         "Cp863",
-        "Cp864",
+        //"Cp864",
         "Cp865",
         "Cp866",
         "Cp868",
@@ -180,7 +180,7 @@ public final class Test4625418 implements ExceptionListener {
         "IBM861",
         "IBM862",
         "IBM863",
-        "IBM864",
+        //"IBM864",
         "IBM865",
         "IBM866",
         "IBM868",
diff --git a/test/jdk/sun/nio/cs/mapping/Cp864.c2b-irreversible b/test/jdk/sun/nio/cs/mapping/Cp864.c2b-irreversible
new file mode 100644
index 00000000000..2b4e57b3364
--- /dev/null
+++ b/test/jdk/sun/nio/cs/mapping/Cp864.c2b-irreversible
@@ -0,0 +1 @@
+0025	0025