diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/MappingIteratorEnd9Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MappingIteratorEnd9Test.java
similarity index 83%
rename from csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/MappingIteratorEnd9Test.java
rename to csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MappingIteratorEnd9Test.java
index ba238c82..aa061db4 100644
--- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/MappingIteratorEnd9Test.java
+++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MappingIteratorEnd9Test.java
@@ -1,9 +1,10 @@
-package com.fasterxml.jackson.dataformat.csv.failing;
+package com.fasterxml.jackson.dataformat.csv.tofix;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.dataformat.csv.*;
+import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -11,6 +12,7 @@
 public class MappingIteratorEnd9Test extends ModuleTestBase
 {
     // for [dataformats-text#9] (was [dataformat-csv#119])
+    @JacksonTestFailureExpected
     @Test
     public void testDefaultSimpleQuotes() throws Exception
     {
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/MissingNullsOnObjectArrayWrite10Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java
similarity index 87%
rename from csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/MissingNullsOnObjectArrayWrite10Test.java
rename to csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java
index 4b154fcc..65b2ee1f 100644
--- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/MissingNullsOnObjectArrayWrite10Test.java
+++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/MissingNullsOnObjectArrayWrite10Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.csv.failing;
+package com.fasterxml.jackson.dataformat.csv.tofix;
 
 import java.io.StringWriter;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.dataformat.csv.*;
+import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -15,6 +16,7 @@ public class MissingNullsOnObjectArrayWrite10Test extends ModuleTestBase
     private final CsvMapper MAPPER = mapperForCsv();
 
     // for [dataformats-text#10]
+    @JacksonTestFailureExpected
     @Test
     public void testNullsOnObjectArrayWrites2Col() throws Exception
     {
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/NullWriting116Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/NullWriting116Test.java
similarity index 88%
rename from csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/NullWriting116Test.java
rename to csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/NullWriting116Test.java
index e69d1a04..f7bb90c4 100644
--- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/NullWriting116Test.java
+++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/NullWriting116Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.csv.failing;
+package com.fasterxml.jackson.dataformat.csv.tofix;
 
 import java.io.StringWriter;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SequenceWriter;
 import com.fasterxml.jackson.dataformat.csv.*;
+import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -15,6 +16,7 @@ public class NullWriting116Test extends ModuleTestBase
     private final CsvMapper csv = mapperForCsv();
 
     // [dataformat#116]
+    @JacksonTestFailureExpected
     @Test
     public void testWithObjectArray() throws Exception 
     {
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/ParserQuotes19Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/ParserQuotes19Test.java
similarity index 88%
rename from csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/ParserQuotes19Test.java
rename to csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/ParserQuotes19Test.java
index 8eee1f95..cf4cbc8e 100644
--- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/ParserQuotes19Test.java
+++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/ParserQuotes19Test.java
@@ -1,9 +1,10 @@
-package com.fasterxml.jackson.dataformat.csv.failing;
+package com.fasterxml.jackson.dataformat.csv.tofix;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.dataformat.csv.*;
+import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -22,6 +23,7 @@ protected static class ThreeString {
      */
 
     // For #19: need to handle spaces outside quotes, even if not trimming?
+    @JacksonTestFailureExpected
     @Test
     public void testSimpleQuotesWithSpaces() throws Exception
     {
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/UnicodeCSVRead497Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/UnicodeCSVRead497Test.java
similarity index 85%
rename from csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/UnicodeCSVRead497Test.java
rename to csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/UnicodeCSVRead497Test.java
index 1d865941..628887d9 100644
--- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/failing/UnicodeCSVRead497Test.java
+++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/tofix/UnicodeCSVRead497Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.csv.failing;
+package com.fasterxml.jackson.dataformat.csv.tofix;
 
 import java.nio.charset.StandardCharsets;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.ModuleTestBase;
+import com.fasterxml.jackson.dataformat.csv.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -16,6 +17,7 @@ public class UnicodeCSVRead497Test extends ModuleTestBase
     private final CsvMapper MAPPER = mapperForCsv();
 
     // [dataformats-text#497]
+    @JacksonTestFailureExpected
     @Test
     public void testUnicodeAtEnd() throws Exception
     {
diff --git a/pom.xml b/pom.xml
index 0703d210..8a60ca9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,16 +101,6 @@
             </execution>
           </executions>
         </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
 
diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/ObjectIdWithTree2Test.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/ObjectIdWithTree2Test.java
similarity index 92%
rename from yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/ObjectIdWithTree2Test.java
rename to yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/ObjectIdWithTree2Test.java
index 615b95dc..68363aad 100644
--- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/ObjectIdWithTree2Test.java
+++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/ObjectIdWithTree2Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.yaml.failing;
+package com.fasterxml.jackson.dataformat.yaml.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.ModuleTestBase;
+import com.fasterxml.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 /**
@@ -44,6 +45,7 @@ public Node(String name) {
             ;
 
     // [dataformats-text#2]
+    @JacksonTestFailureExpected
     @Test
     public void testRoundtripViaTree() throws Exception
     {
diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/PolymorphicWithObjectId25Test.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/PolymorphicWithObjectId25Test.java
similarity index 91%
rename from yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/PolymorphicWithObjectId25Test.java
rename to yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/PolymorphicWithObjectId25Test.java
index d30415cd..221e6efe 100644
--- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/PolymorphicWithObjectId25Test.java
+++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/PolymorphicWithObjectId25Test.java
@@ -1,10 +1,11 @@
-package com.fasterxml.jackson.dataformat.yaml.failing;
+package com.fasterxml.jackson.dataformat.yaml.tofix;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.ModuleTestBase;
+import com.fasterxml.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -39,6 +40,7 @@ static class SubNodeWithStringId extends NodeWithStringId { }
     private final ObjectMapper MAPPER = newObjectMapper();
     
     // [dataformats-text#25]
+    @JacksonTestFailureExpected
     @Test
     public void testPolymorphicAndObjectId25() throws Exception
     {
diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/SimpleGeneration215Test.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/SimpleGeneration215Test.java
similarity index 87%
rename from yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/SimpleGeneration215Test.java
rename to yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/SimpleGeneration215Test.java
index f3c83a8e..95ea3662 100644
--- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/SimpleGeneration215Test.java
+++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/SimpleGeneration215Test.java
@@ -1,10 +1,11 @@
-package com.fasterxml.jackson.dataformat.yaml.failing;
+package com.fasterxml.jackson.dataformat.yaml.tofix;
 
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.dataformat.yaml.*;
+import com.fasterxml.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 // NOTE: fails only on 2.x (2.12) -- fixed for 3.0
@@ -12,6 +13,7 @@ public class SimpleGeneration215Test extends ModuleTestBase
 {
     // [dataformats-text#215]: trying to disable WRITE_DOC_START_MARKER
     // via ObjectWriter does not work
+    @JacksonTestFailureExpected
     @Test
     public void testStartMarkerViaWriter() throws Exception
     {
diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/SimpleGeneration366Test.java
similarity index 91%
rename from yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java
rename to yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/SimpleGeneration366Test.java
index 1d82c13e..9d06f3c5 100644
--- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java
+++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/SimpleGeneration366Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.yaml.failing;
+package com.fasterxml.jackson.dataformat.yaml.tofix;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.dataformat.yaml.*;
+import com.fasterxml.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,6 +14,7 @@
 public class SimpleGeneration366Test extends ModuleTestBase
 {
     // [dataformats-text#366]: multiline literal block with trailing spaces does not work
+    @JacksonTestFailureExpected
     @Test
     public void testLiteralBlockStyleMultilineWithTrailingSpace() throws Exception
     {
diff --git a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/UnicodeYAMLRead497Test.java b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/UnicodeYAMLRead497Test.java
similarity index 90%
rename from yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/UnicodeYAMLRead497Test.java
rename to yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/UnicodeYAMLRead497Test.java
index 02e303e9..d5b2f797 100644
--- a/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/failing/UnicodeYAMLRead497Test.java
+++ b/yaml/src/test/java/com/fasterxml/jackson/dataformat/yaml/tofix/UnicodeYAMLRead497Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.dataformat.yaml.failing;
+package com.fasterxml.jackson.dataformat.yaml.tofix;
 
 import java.nio.charset.StandardCharsets;
 
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.yaml.ModuleTestBase;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
+import com.fasterxml.jackson.dataformat.yaml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -17,6 +18,7 @@ public class UnicodeYAMLRead497Test extends ModuleTestBase
     private final YAMLMapper MAPPER = newObjectMapper();
 
     // [dataformats-text#497]
+    @JacksonTestFailureExpected
     @Test
     public void testUnicodeAtEnd() throws Exception
     {