diff --git a/src/test/java/failing/TestBasicSax.java b/src/test/java/failing/BasicSaxTest.java
similarity index 98%
rename from src/test/java/failing/TestBasicSax.java
rename to src/test/java/failing/BasicSaxTest.java
index 274c22a6..7a47644c 100644
--- a/src/test/java/failing/TestBasicSax.java
+++ b/src/test/java/failing/BasicSaxTest.java
@@ -15,7 +15,7 @@
  * Simple unit tests to verify that most fundamental parsing functionality
  * works via Woodstox SAX implementation.
  */
-public class TestBasicSax
+public class BasicSaxTest
     extends BaseWstxTest
 {
     /**
diff --git a/src/test/java/failing/TestExtLocationInfo91.java b/src/test/java/failing/ExtLocationInfo91Test.java
similarity index 99%
rename from src/test/java/failing/TestExtLocationInfo91.java
rename to src/test/java/failing/ExtLocationInfo91Test.java
index ed852b69..56e94fa3 100644
--- a/src/test/java/failing/TestExtLocationInfo91.java
+++ b/src/test/java/failing/ExtLocationInfo91Test.java
@@ -12,7 +12,7 @@
  * Set of unit tests that checks that the {@link LocationInfo} implementation
  * works as expected, provides proper values or -1 to indicate "don't know".
  */
-public class TestExtLocationInfo91
+public class ExtLocationInfo91Test
     extends BaseStax2Test
 {
     final static String URI = "main.xml";
diff --git a/src/test/java/failing/TestRelaxNG.java b/src/test/java/failing/RelaxNGTest.java
similarity index 99%
rename from src/test/java/failing/TestRelaxNG.java
rename to src/test/java/failing/RelaxNGTest.java
index 49903705..65869f94 100644
--- a/src/test/java/failing/TestRelaxNG.java
+++ b/src/test/java/failing/RelaxNGTest.java
@@ -11,7 +11,7 @@
  * This is a simple base-line "smoke test" that checks that RelaxNG
  * validation works at least minimally.
  */
-public class TestRelaxNG
+public class RelaxNGTest
     extends BaseValidationTest
 {
     final static String SIMPLE_RNG_SCHEMA =
diff --git a/src/test/java/failing/TestW3CDefaultValues.java b/src/test/java/failing/W3CDefaultValuesTest.java
similarity index 98%
rename from src/test/java/failing/TestW3CDefaultValues.java
rename to src/test/java/failing/W3CDefaultValuesTest.java
index 8246a980..d7f93f66 100644
--- a/src/test/java/failing/TestW3CDefaultValues.java
+++ b/src/test/java/failing/W3CDefaultValuesTest.java
@@ -11,7 +11,7 @@
  * Test for XML Schema value constraints (default, required) for
  * elements and attributes.
  */
-public class TestW3CDefaultValues
+public class W3CDefaultValuesTest
     extends BaseValidationTest
 {
     final static String SCHEMA_WITH_DEFAULTS =
diff --git a/src/test/java/failing/TestW3CSchemaNillable179.java b/src/test/java/failing/W3CSchemaNillable179Test.java
similarity index 99%
rename from src/test/java/failing/TestW3CSchemaNillable179.java
rename to src/test/java/failing/W3CSchemaNillable179Test.java
index 07de251c..ea2005cc 100644
--- a/src/test/java/failing/TestW3CSchemaNillable179.java
+++ b/src/test/java/failing/W3CSchemaNillable179Test.java
@@ -22,7 +22,7 @@
  * Test whether MSV validator behaves the same w.r.t. nillable elements as javax.xml.validation validator.
  * A reproducer for <a href="https://github.com/FasterXML/woodstox/issues/179">https://github.com/FasterXML/woodstox/issues/179</a>.
  */
-public class TestW3CSchemaNillable179
+public class W3CSchemaNillable179Test
     extends BaseValidationTest
 {
     // for [woodstox-core#179]
diff --git a/src/test/java/failing/TestW3CSchemaTypes.java b/src/test/java/failing/W3CSchemaTypesTest.java
similarity index 97%
rename from src/test/java/failing/TestW3CSchemaTypes.java
rename to src/test/java/failing/W3CSchemaTypesTest.java
index f675eb61..afd1fe48 100644
--- a/src/test/java/failing/TestW3CSchemaTypes.java
+++ b/src/test/java/failing/W3CSchemaTypesTest.java
@@ -10,7 +10,7 @@
  *
  * @author Tatu Saloranta
  */
-public class TestW3CSchemaTypes
+public class W3CSchemaTypesTest
     extends BaseValidationTest
 {
 	private final static String SCHEMA_INT =