diff --git a/tests/php/Forms/CurrencyField_DisabledTest.php b/tests/php/Forms/CurrencyFieldDisabledTest.php
similarity index 95%
rename from tests/php/Forms/CurrencyField_DisabledTest.php
rename to tests/php/Forms/CurrencyFieldDisabledTest.php
index ed832521c..a36efec58 100644
--- a/tests/php/Forms/CurrencyField_DisabledTest.php
+++ b/tests/php/Forms/CurrencyFieldDisabledTest.php
@@ -6,7 +6,7 @@ use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\CurrencyField_Disabled;
 use SilverStripe\ORM\FieldType\DBCurrency;
 
-class CurrencyField_DisabledTest extends SapphireTest
+class CurrencyFieldDisabledTest extends SapphireTest
 {
     public function testFieldWithValue()
     {
diff --git a/tests/php/Forms/CurrencyField_ReadonlyTest.php b/tests/php/Forms/CurrencyFieldReadonlyTest.php
similarity index 97%
rename from tests/php/Forms/CurrencyField_ReadonlyTest.php
rename to tests/php/Forms/CurrencyFieldReadonlyTest.php
index 289327cd1..d403126e7 100644
--- a/tests/php/Forms/CurrencyField_ReadonlyTest.php
+++ b/tests/php/Forms/CurrencyFieldReadonlyTest.php
@@ -6,7 +6,7 @@ use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\CurrencyField_Readonly;
 use SilverStripe\ORM\FieldType\DBCurrency;
 
-class CurrencyField_ReadonlyTest extends SapphireTest
+class CurrencyFieldReadonlyTest extends SapphireTest
 {
     public function testPerformReadonlyTransformation()
     {
diff --git a/tests/php/Forms/DateField_DisabledTest.php b/tests/php/Forms/DateFieldDisabledTest.php
similarity index 98%
rename from tests/php/Forms/DateField_DisabledTest.php
rename to tests/php/Forms/DateFieldDisabledTest.php
index 0108b751d..6fffdcd13 100644
--- a/tests/php/Forms/DateField_DisabledTest.php
+++ b/tests/php/Forms/DateFieldDisabledTest.php
@@ -10,7 +10,7 @@ use SilverStripe\ORM\FieldType\DBDatetime;
 /**
  * @skipUpgrade
  */
-class DateField_DisabledTest extends SapphireTest
+class DateFieldDisabledTest extends SapphireTest
 {
     protected function setUp()
     {
diff --git a/tests/php/Forms/PrintableTransformation_TabSetTest.php b/tests/php/Forms/PrintableTransformationTabSetTest.php
similarity index 93%
rename from tests/php/Forms/PrintableTransformation_TabSetTest.php
rename to tests/php/Forms/PrintableTransformationTabSetTest.php
index 11ca4efd8..12691ddde 100644
--- a/tests/php/Forms/PrintableTransformation_TabSetTest.php
+++ b/tests/php/Forms/PrintableTransformationTabSetTest.php
@@ -7,7 +7,7 @@ use SilverStripe\Forms\PrintableTransformation_TabSet;
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TabSet;
 
-class PrintableTransformation_TabSetTest extends SapphireTest
+class PrintableTransformationTabSetTest extends SapphireTest
 {
     public function testFieldHolder()
     {