diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java
index 10ebee2b0e9fc..4cf0d1de28717 100644
--- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java
@@ -117,7 +117,6 @@ protected Map<String, Class<?>> getTokenFilters() {
         filters.put("russianlightstem", StemmerTokenFilterFactory.class);
         filters.put("soranistem", StemmerTokenFilterFactory.class);
         filters.put("spanishlightstem", StemmerTokenFilterFactory.class);
-        filters.put("spanishpluralstem", StemmerTokenFilterFactory.class);
         filters.put("swedishlightstem", StemmerTokenFilterFactory.class);
         filters.put("swedishminimalstem", Void.class);
         filters.put("stemmeroverride", StemmerOverrideTokenFilterFactory.class);
diff --git a/plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/AnalysisICUFactoryTests.java b/plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/AnalysisICUFactoryTests.java
index 1918c7045d270..10aa2bd085b0e 100644
--- a/plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/AnalysisICUFactoryTests.java
+++ b/plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/AnalysisICUFactoryTests.java
@@ -56,7 +56,6 @@ protected Map<String, Class<?>> getTokenFilters() {
         filters.put("icufolding", IcuFoldingTokenFilterFactory.class);
         filters.put("icunormalizer2", IcuNormalizerTokenFilterFactory.class);
         filters.put("icutransform", IcuTransformTokenFilterFactory.class);
-        filters.put("spanishpluralstem", IcuTransformTokenFilterFactory.class);
         return filters;
     }
 
diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
index 80c573f3cc9ae..fd762289caddb 100644
--- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
@@ -61,7 +61,7 @@
 public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
 
     private static final Map<String, Class<?>> KNOWN_TOKENIZERS = new MapBuilder<String, Class<?>>()
-        // exposed in ES
+        // exposed in OpenSearch
         .put("classic", MovedToAnalysisCommon.class)
         .put("edgengram", MovedToAnalysisCommon.class)
         .put("keyword", MovedToAnalysisCommon.class)
@@ -81,7 +81,7 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
         .immutableMap();
 
     static final Map<String, Class<?>> KNOWN_TOKENFILTERS = new MapBuilder<String, Class<?>>()
-        // exposed in ES
+        // exposed in OpenSearch
         .put("apostrophe", MovedToAnalysisCommon.class)
         .put("arabicnormalization", MovedToAnalysisCommon.class)
         .put("arabicstem", MovedToAnalysisCommon.class)
@@ -217,6 +217,10 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
         .put("japanesecompletion", Void.class)
         // LUCENE-9575: recognize arbitrary patterns that include punctuation
         .put("patterntyping", Void.class)
+        // LUCENE-10248
+        .put("spanishpluralstem", Void.class)
+        // LUCENE-10352
+        .put("daitchmokotoffsoundex", Void.class)
         .immutableMap();
 
     static final Map<String, Class<?>> KNOWN_CHARFILTERS = new MapBuilder<String, Class<?>>()