diff --git a/src/test/java/com/fasterxml/jackson/failing/TestSetterlessProperties501.java b/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
similarity index 97%
rename from src/test/java/com/fasterxml/jackson/failing/TestSetterlessProperties501.java
rename to src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
index fac6c1744a..9eba2549b7 100644
--- a/src/test/java/com/fasterxml/jackson/failing/TestSetterlessProperties501.java
+++ b/src/test/java/com/fasterxml/jackson/failing/SetterlessProperties501Test.java
@@ -15,7 +15,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class TestSetterlessProperties501 extends DatabindTestUtil {
+class SetterlessProperties501Test extends DatabindTestUtil {
     static class Poly {
         public int id;
 
diff --git a/src/test/java/com/fasterxml/jackson/failing/TestUnwrappedMap171.java b/src/test/java/com/fasterxml/jackson/failing/TestUnwrappedMap171.java
deleted file mode 100644
index 4cab954af4..0000000000
--- a/src/test/java/com/fasterxml/jackson/failing/TestUnwrappedMap171.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fasterxml.jackson.failing;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-// Tests for [#171]
-class TestUnwrappedMap171 extends DatabindTestUtil {
-    static class MapUnwrap {
-
-        public MapUnwrap() {
-        }
-
-        public MapUnwrap(String key, Object value) {
-            map = Collections.singletonMap(key, value);
-        }
-
-        @JsonUnwrapped(prefix = "map.")
-        public Map<String, Object> map;
-    }
-
-    private final ObjectMapper MAPPER = new ObjectMapper();
-
-    @Test
-    void mapUnwrapSerialize() throws Exception {
-        String json = MAPPER.writeValueAsString(new MapUnwrap("test", 6));
-        assertEquals("{\"map.test\": 6}", json);
-    }
-
-    @Test
-    void mapUnwrapDeserialize() throws Exception {
-        MapUnwrap root = MAPPER.readValue("{\"map.test\": 6}", MapUnwrap.class);
-
-        assertEquals(1, root.map.size());
-        assertEquals(6, ((Number) root.map.get("test")).intValue());
-    }
-}
diff --git a/src/test/java/com/fasterxml/jackson/failing/TestUnwrappedWithUnknown650.java b/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
similarity index 94%
rename from src/test/java/com/fasterxml/jackson/failing/TestUnwrappedWithUnknown650.java
rename to src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
index e853ba7a8e..fb19a43917 100644
--- a/src/test/java/com/fasterxml/jackson/failing/TestUnwrappedWithUnknown650.java
+++ b/src/test/java/com/fasterxml/jackson/failing/UnwrappedWithUnknown650Test.java
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-class TestUnwrappedWithUnknown650 extends DatabindTestUtil {
+class UnwrappedWithUnknown650Test extends DatabindTestUtil {
     static class A {
         @JsonUnwrapped
         public B b;