diff --git a/src/test-jdk17/java/com/fasterxml/jackson/failing/DuplicatePropertyDeserializationRecord4690Test.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java
similarity index 85%
rename from src/test-jdk17/java/com/fasterxml/jackson/failing/DuplicatePropertyDeserializationRecord4690Test.java
rename to src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java
index 5bc1c8534c..bc8c76658c 100644
--- a/src/test-jdk17/java/com/fasterxml/jackson/failing/DuplicatePropertyDeserializationRecord4690Test.java
+++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/DuplicatePropertyDeserializationRecord4690Test.java
@@ -1,7 +1,9 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -17,6 +19,7 @@ record MyRecord(String first) { }
 
     private final ObjectMapper mapper = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void testDuplicatePropertyDeserialization() throws Exception {
         final String json = a2q("{'first':'value','first':'value2'}");
diff --git a/src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java
similarity index 86%
rename from src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java
rename to src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java
index de24fe331a..4c2767bac3 100644
--- a/src/test-jdk17/java/com/fasterxml/jackson/databind/failing/RecordUpdate3079FailingTest.java
+++ b/src/test-jdk17/java/com/fasterxml/jackson/databind/tofix/RecordUpdate3079FailingTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Collections;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.records.RecordUpdate3079Test;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -17,6 +18,7 @@ public class RecordUpdate3079FailingTest extends DatabindTestUtil
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#3079]: Should be able to Record value directly
+    @JacksonTestFailureExpected
     @Test
     public void testDirectRecordUpdate() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java
index 0cf9f53d1c..436df2947c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/AnyGetterSorting518Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterSorting518Test.java
@@ -1,9 +1,10 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -43,6 +44,7 @@ public Bean(int a, int b, Map<String,Object> x) {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void anyBeanWithSort() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java
index a01eb0db33..8ea90658e5 100644
--- a/src/test/java/com/fasterxml/jackson/failing/AnySetterAsCreatorFallback1401Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AnySetterAsCreatorFallback1401Test.java
@@ -1,5 +1,6 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
@@ -36,6 +37,7 @@ public void any(String key, Object value) { }
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#1401]
+    @JacksonTestFailureExpected
     @Test
     void creatorNoSetter() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java
index e11af3c60c..7d2c801733 100644
--- a/src/test/java/com/fasterxml/jackson/failing/AsEmptyPOJONoDefaultCtor2572Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/AsEmptyPOJONoDefaultCtor2572Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.*;
@@ -34,6 +35,7 @@ public Inner(@JsonProperty("field") String field) {
     }
 
     // [databind#2572]
+    @JacksonTestFailureExpected
     @Test
     void emptyForTypeThatCannotBeInstantiated() throws Exception {
         ObjectMapper mapper = jsonMapperBuilder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java
index de2774f847..ed723d763b 100644
--- a/src/test/java/com/fasterxml/jackson/failing/BackReference1516Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BackReference1516Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.beans.ConstructorProperties;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -74,6 +75,7 @@ public ChildObject2(String id, String name,
                     "  'child': { 'id': 'def', 'name':'Bert' }\n" +
                     "}");
 
+    @JacksonTestFailureExpected
     @Test
     void withParentCreator() throws Exception {
         ParentWithCreator result = MAPPER.readValue(PARENT_CHILD_JSON,
diff --git a/src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java
index 08058a65a3..89f79eac03 100644
--- a/src/test/java/com/fasterxml/jackson/failing/BuilderWithBackRef2686Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/BuilderWithBackRef2686Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.beans.ConstructorProperties;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
@@ -90,6 +91,7 @@ Content build() {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void buildWithBackRefs2686() throws Exception {
         Container container = new Container();
diff --git a/src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java
index 6109e65c85..3692e6d996 100644
--- a/src/test/java/com/fasterxml/jackson/failing/CreatorFallback2438Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CreatorFallback2438Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -33,6 +34,7 @@ public void setValue(int v) {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void creator2438() throws Exception {
         // note: by default, duplicate-detection not enabled, so should not
diff --git a/src/test/java/com/fasterxml/jackson/failing/CustomObjectKeyDeserializer4680Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/CustomObjectKeyDeserializer4680Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java
index c05de238b7..720212ce91 100644
--- a/src/test/java/com/fasterxml/jackson/failing/CustomObjectKeyDeserializer4680Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/CustomObjectKeyDeserializer4680Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Map;
 
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -16,6 +17,7 @@
 public class CustomObjectKeyDeserializer4680Test
 {
 
+    @JacksonTestFailureExpected
     @Test
     void testCustomKeyDeserializer()
             throws Exception
diff --git a/src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java
similarity index 90%
rename from src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java
index e71117d567..c7d7181c1c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/DefaultTypingOverride1391Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/DefaultTypingOverride1391Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -25,6 +26,7 @@ static class ListWrapper {
         public Collection<String> stuff = Collections.emptyList();
     }
 
+    @JacksonTestFailureExpected
     @Test
     void collectionWithOverride() throws Exception {
         final ObjectMapper mapper = JsonMapper.builder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java
index 2c19289cef..fbf560468c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ExternalTypeIdWithUnwrapped2039Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ExternalTypeIdWithUnwrapped2039Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -41,6 +42,7 @@ public static class SubA2039 extends SubType2039 {
         public boolean bool;
     }
 
+    @JacksonTestFailureExpected
     @Test
     void externalWithUnwrapped2039() throws Exception {
         final ObjectMapper mapper = newJsonMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java
index b03b88d1bd..2838751948 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2465Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2465Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -45,6 +46,7 @@ public Internal2465(String val) {
     }
 
     // [databind#2465]
+    @JacksonTestFailureExpected
     @Test
     void injectWithCreator() throws Exception {
         ObjectMapper mapper = jsonMapperBuilder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java
index 8d2a385d97..20f1d41abc 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject2678Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject2678Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -40,6 +41,7 @@ public String getField2() {
     }
 
     // [databind#2678]
+    @JacksonTestFailureExpected
     @Test
     void readValueInjectables() throws Exception {
         final InjectableValues injectableValues =
diff --git a/src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java
index 8896397573..fad3164a95 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JacksonInject4218Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JacksonInject4218Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -49,6 +50,7 @@ public Object findInjectableValue(
     }
 
     // [databind#4218]
+    @JacksonTestFailureExpected
     @Test
     void injectFail4218() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java
similarity index 97%
rename from src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java
index 8442e4a887..4a0d086b12 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonIdentityInfoAndBackReferences3964Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIdentityInfoAndBackReferences3964Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.List;
 
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -206,6 +207,7 @@ public static class Shrimp {
     /**
      * Fails : Original test
      */
+    @JacksonTestFailureExpected
     @Test
     void original() throws Exception {
         String json = "{" +
@@ -238,6 +240,7 @@ void original() throws Exception {
     /**
      * Fails : Lean version that fails and Without getters and setters
      */
+    @JacksonTestFailureExpected
     @Test
     void leanWithoutGetterAndSetters() throws Exception {
         String json = a2q("{" +
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java
similarity index 88%
rename from src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java
index 7486714ca9..a3c13b747d 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonIgnoreProperties2803Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonIgnoreProperties2803Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -29,6 +30,7 @@ static class Room2803 {
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // [databind#2803]
+    @JacksonTestFailureExpected
     @Test
     void ignoreProps2803() throws Exception {
         final String DOC = "{\"lobby\":{\"id\":\"L1\"}}";
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java
index a7a3b07bde..ed495d852c 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonSetter2572Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonSetter2572Test.java
@@ -1,7 +1,8 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.*;
@@ -14,6 +15,7 @@
 // different from 2.10 in that no exception thrown and databind quietly just
 // left `null` for Beans as `null` even if "EMPTY" was indicated by configuration.
 class JsonSetter2572Test extends DatabindTestUtil {
+
     static class Outer {
         @JsonProperty("inner")
         final Inner inner;
@@ -34,6 +36,7 @@ public Inner(@JsonProperty("field") String field) {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void setterWithEmpty() throws Exception {
         /*
@@ -48,7 +51,6 @@ void setterWithEmpty() throws Exception {
         Outer result = mapper.readValue(json, Outer.class);
         assertNotNull(result);
         assertNotNull(result.inner); // converted to "empty" bean
-
-//System.err.println("Final -> "+mapper.writeValueAsString(result));
     }
+
 }
diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java
index 9908d7f9db..09efa5431e 100644
--- a/src/test/java/com/fasterxml/jackson/failing/JsonTypeIdConflict3681Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/JsonTypeIdConflict3681Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -57,6 +58,7 @@ private static class WrapperC {
      *  private interface C extends A, B {}
      * </pre>
      */
+    @JacksonTestFailureExpected
     @Test
     void failureWithTypeIdConflict() throws Exception {
         WrapperC c = MAPPER.readValue(a2q("{'c': {'type': 'c_impl'}}"), WrapperC.class);
diff --git a/src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java
index 7eafac0eb4..7b4b4ac25e 100644
--- a/src/test/java/com/fasterxml/jackson/failing/KevinFail1410Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/KevinFail1410Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -79,6 +80,7 @@ public String toString() {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void dupProps() throws Exception {
         ObjectMapper mapper = newJsonMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java
similarity index 89%
rename from src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java
index 8316bdd89f..d8810d5b27 100644
--- a/src/test/java/com/fasterxml/jackson/failing/MapEntryFormat1419Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapEntryFormat1419Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -29,6 +30,7 @@ public BeanWithMapEntryAsObject(String key, String value) {
 
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void wrappedAsObjectRoundtrip() throws Exception {
         BeanWithMapEntryAsObject input = new BeanWithMapEntryAsObject("foo", "bar");
diff --git a/src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java
similarity index 88%
rename from src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java
index 9c1789fd2d..73ce902664 100644
--- a/src/test/java/com/fasterxml/jackson/failing/MapInclusion1649Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MapInclusion1649Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -26,6 +27,7 @@ public Bean1649(String key, String value) {
     final private ObjectMapper MAPPER = objectMapper();
 
     // [databind#1649]
+    @JacksonTestFailureExpected
     @Test
     void nonEmptyViaClass() throws IOException {
         // non-empty/null, include
diff --git a/src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java
similarity index 95%
rename from src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java
index 34105a7d9c..8e249d8f45 100644
--- a/src/test/java/com/fasterxml/jackson/failing/MergeWithCreator1921Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/MergeWithCreator1921Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.Objects;
 
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -66,6 +67,7 @@ public String getValidTo() {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void mergeWithCreator() throws Exception {
         final String JSON = "{ \"validity\": { \"validFrom\": \"2018-02-01\", \"validTo\": \"2018-01-31\" } }";
diff --git a/src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java
index 0902fa0f23..148f0c0c79 100644
--- a/src/test/java/com/fasterxml/jackson/failing/NoTypeInfo1654Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/NoTypeInfo1654Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -79,6 +80,7 @@ void noTypeElementOverride() throws Exception {
     }
 
     // [databind#1654]
+    @JacksonTestFailureExpected
     @Test
     void noTypeInfoOverrideSer() throws Exception {
         Value1654UntypedContainer cont = new Value1654UntypedContainer(
@@ -90,6 +92,7 @@ void noTypeInfoOverrideSer() throws Exception {
     }
 
     // [databind#1654]
+    @JacksonTestFailureExpected
     @Test
     void noTypeInfoOverrideDeser() throws Exception {
         // and then actual failing case
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java
index 84b10e74bc..460a4f048f 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdDeserializationFailTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdDeserializationFailTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.EnumMap;
@@ -10,7 +10,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.objectid.TestObjectId.Employee;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-import com.fasterxml.jackson.failing.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+import com.fasterxml.jackson.databind.tofix.ObjectIdDeserializationFailTest.EnumMapCompany.FooEnum;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -52,6 +53,7 @@ public void setReports(List<DefensiveEmployee> reports) {
 
     private final ObjectMapper mapper = new ObjectMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void forwardReferenceInArray() throws Exception {
         String json = "{\"employees\":["
@@ -81,6 +83,7 @@ void forwardReferenceInQueue() throws Exception {
         assertEmployees(firstEmployee, secondEmployee);
     }
 
+    @JacksonTestFailureExpected
     @Test
     void forwardReferenceInEnumMap()
             throws Exception {
@@ -96,6 +99,7 @@ void forwardReferenceInEnumMap()
         assertEmployees(firstEmployee, secondEmployee);
     }
 
+    @JacksonTestFailureExpected
     @Test
     void forwardReferenceWithDefensiveCopy()
             throws Exception {
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java
index a98d1a4b93..44ef296c8d 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithBuilder1496Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithBuilder1496Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -80,6 +81,7 @@ public POJO readFromCacheOrBuild() {
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void builderId1496() throws Exception {
         POJO input = new POJOBuilder().id(123L).var(456).build();
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java
similarity index 90%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java
index 24a23d429a..2b368ea819 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectable639Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectable639Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -34,6 +35,7 @@ public Child2(@JsonProperty("parent") Parent2 parent) {
     }
 
     // for [databind#639]
+    @JacksonTestFailureExpected
     @Test
     void objectIdWithInjectable() throws Exception {
         ObjectMapper mapper = new ObjectMapper()
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java
index c44c7c956d..46453617d0 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithInjectables639Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithInjectables639Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 // This is probably impossible to handle, in general case, since
 // there is a cycle for Parent2/Child2... unless special handling
@@ -64,6 +65,7 @@ public Child2(@JacksonInject Context context,
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void objectIdWithInjectables() throws Exception {
         ObjectMapper mapper = new ObjectMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java
index 06ef109c65..eaee5dc6ce 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ObjectIdWithUnwrapping1298Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ObjectIdWithUnwrapping1298Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -53,6 +54,7 @@ public Child(@JsonProperty("name") String name) {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void objectIdWithRepeatedChild() throws Exception {
         ObjectMapper mapper = JsonMapper.builder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java
index a6c9f48a00..1161ec2722 100644
--- a/src/test/java/com/fasterxml/jackson/failing/ParsingContextExtTypeId2747Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/ParsingContextExtTypeId2747Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -54,6 +55,7 @@ static String getCurrentLocationAsString(JsonParser p) {
     }
 
     // [databind#2747]
+    @JacksonTestFailureExpected
     @Test
     void locationAccessWithExtTypeId() throws Exception {
         ObjectReader objectReader = newJsonMapper().readerFor(Wrapper.class);
diff --git a/src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java
index 19416e9356..5693eab006 100644
--- a/src/test/java/com/fasterxml/jackson/failing/PolymorphicArrays3194Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/PolymorphicArrays3194Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -18,6 +19,7 @@ static final class SomeBean {
         public Object[][] value;
     }
 
+    @JacksonTestFailureExpected
     @Test
     void twoDimensionalArrayMapping() throws Exception {
         PolymorphicTypeValidator typeValidator = BasicPolymorphicTypeValidator.builder()
diff --git a/src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java
index 59af117c1f..3ffc3c1be0 100644
--- a/src/test/java/com/fasterxml/jackson/failing/RecursiveIgnoreProperties1755Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveIgnoreProperties1755Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -43,6 +44,7 @@ static class Item4417 {
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // for [databind#1755]
+    @JacksonTestFailureExpected
     @Test
     void recursiveIgnore1755() throws Exception
     {
@@ -75,6 +77,7 @@ void recursiveIgnore1755() throws Exception
     }
 
     // for [databind#4417]
+    @JacksonTestFailureExpected
     @Test
     void recursiveIgnore4417() throws Exception
     {
diff --git a/src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java
index 55248a26c5..d8d113279a 100644
--- a/src/test/java/com/fasterxml/jackson/failing/RecursiveWildcard4118Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/RecursiveWildcard4118Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -55,6 +56,7 @@ public TestObject4118(List<TestAttribute4118<?>> attributes) {
     private final ObjectMapper MAPPER = newJsonMapper();
 
     // for [databind#4118]
+    @JacksonTestFailureExpected
     @Test
     void recursiveWildcard4118() throws Exception {
         Tree<?> tree = MAPPER.readValue("[[[]]]", new TypeReference<Tree<?>>() {
@@ -66,6 +68,7 @@ void recursiveWildcard4118() throws Exception {
     }
 
     // for [databind#4118]
+    @JacksonTestFailureExpected
     @Test
     void deserWildcard4118() throws Exception {
         // Given
diff --git a/src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java
similarity index 87%
rename from src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java
index 750e1607af..b7de71848a 100644
--- a/src/test/java/com/fasterxml/jackson/failing/SetterlessList2692Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessList2692Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 class SetterlessList2692Test extends DatabindTestUtil {
     static class DataBean {
@@ -35,6 +36,7 @@ public String toString() {
         }
     }
 
+    @JacksonTestFailureExpected
     @Test
     void issue2692() throws Exception {
         ObjectMapper om = newJsonMapper();
diff --git a/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java
similarity index 93%
rename from src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java
index 9eba2549b7..ea317b533d 100644
--- a/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/SetterlessProperties501Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -55,6 +56,7 @@ public Map<String, Poly> getMap() {
     }
 
     // For [databind#501]
+    @JacksonTestFailureExpected
     @Test
     void setterlessWithPolymorphic() throws Exception {
         Issue501Bean input = new Issue501Bean("a", new Poly(13));
diff --git a/src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java
similarity index 92%
rename from src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java
index 8d2c74556f..d2167b047b 100644
--- a/src/test/java/com/fasterxml/jackson/failing/StaticTyping1515Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/StaticTyping1515Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -67,12 +68,14 @@ static class Issue515Lists {
             .enable(MapperFeature.USE_STATIC_TYPING)
             .build();
 
+    @JacksonTestFailureExpected
     @Test
     void staticTypingForProperties() throws Exception {
         String json = STAT_MAPPER.writeValueAsString(new Issue515Singles());
         assertEquals(a2q("{'value':{'a':1},'aValue':{'a':1,'b':2},'dValue':{'a':3,'b':4}}"), json);
     }
 
+    @JacksonTestFailureExpected
     @Test
     void staticTypingForLists() throws Exception {
         String json = STAT_MAPPER.writeValueAsString(new Issue515Lists());
diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java
similarity index 91%
rename from src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java
index fe8409d88f..dc3d867be9 100644
--- a/src/test/java/com/fasterxml/jackson/failing/UnwrappedCaching2461Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedCaching2461Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -38,6 +39,7 @@ static class OuterContainer {
     }
 
     // [databind#2461]
+    @JacksonTestFailureExpected
     @Test
     void unwrappedCaching() throws Exception {
         final InnerContainer inner = new InnerContainer(new Base("12345"));
diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java
similarity index 86%
rename from src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
rename to src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java
index fb19a43917..666cf29660 100644
--- a/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
+++ b/src/test/java/com/fasterxml/jackson/databind/tofix/UnwrappedWithUnknown650Test.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.tofix;
 
 import org.junit.jupiter.api.Test;
 
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -22,6 +23,7 @@ static class B {
 
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    @JacksonTestFailureExpected
     @Test
     void failOnUnknownPropertyUnwrapped() throws Exception {
         assertTrue(MAPPER.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));