diff --git a/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTest.java b/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java
similarity index 97%
rename from fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTest.java
rename to fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java
index f25df7e..2500998 100644
--- a/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTest.java
+++ b/fop-core/src/test/java/org/apache/fop/configuration/DefaultConfigurationTestCase.java
@@ -22,7 +22,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-public class DefaultConfigurationTest {
+public class DefaultConfigurationTestCase {
 
     DefaultConfiguration configuration;
 
diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
index 3b0043a..2f7fccc 100644
--- a/fop-core/src/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
+++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFLibraryTestSuite.java
@@ -23,7 +23,7 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import org.apache.fop.render.pdf.extensions.PDFEmbeddedFileAttachmentTest;
+import org.apache.fop.render.pdf.extensions.PDFEmbeddedFileAttachmentTestCase;
 
 /**
  * Test suite for FOP's utility classes.
@@ -47,7 +47,7 @@
         VersionControllerTestCase.class,
         PDFRootTestCase.class,
         PDFFileSpecTestCase.class,
-        PDFEmbeddedFileAttachmentTest.class
+        PDFEmbeddedFileAttachmentTestCase.class
 })
 public class PDFLibraryTestSuite {
 }
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTest.java b/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java
similarity index 96%
rename from fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTest.java
rename to fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java
index 6f6c902..d73160d 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTest.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachmentTestCase.java
@@ -24,7 +24,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-public class PDFEmbeddedFileAttachmentTest {
+public class PDFEmbeddedFileAttachmentTestCase {
 
     @Test
     public void testGetFilename() {