diff --git a/.gitattributes b/.gitattributes
index 08dc7fa4c0..0f5283a520 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13139,16 +13139,6 @@ tests/test/tclass6.pp svneol=native#text/plain
 tests/test/tclass7.pp svneol=native#text/plain
 tests/test/tclass8.pp svneol=native#text/plain
 tests/test/tclass9.pp svneol=native#text/pascal
-tests/test/tclassattribute1.pp svneol=native#text/pascal
-tests/test/tclassattribute10.pp svneol=native#text/pascal
-tests/test/tclassattribute2.pp svneol=native#text/pascal
-tests/test/tclassattribute3.pp svneol=native#text/pascal
-tests/test/tclassattribute4.pp svneol=native#text/pascal
-tests/test/tclassattribute5.pp svneol=native#text/pascal
-tests/test/tclassattribute6.pp svneol=native#text/pascal
-tests/test/tclassattribute7.pp svneol=native#text/pascal
-tests/test/tclassattribute8.pp svneol=native#text/pascal
-tests/test/tclassattribute9.pp svneol=native#text/pascal
 tests/test/tclassinfo1.pp svneol=native#text/pascal
 tests/test/tclrprop.pp svneol=native#text/plain
 tests/test/tcmov1.pp svneol=native#text/plain
@@ -13215,6 +13205,16 @@ tests/test/tcptypedconst2.pp svneol=native#text/plain
 tests/test/tcptypedconst3.pp svneol=native#text/plain
 tests/test/tcstring1.pp svneol=native#text/pascal
 tests/test/tcstring2.pp svneol=native#text/pascal
+tests/test/tcustomattr1.pp svneol=native#text/pascal
+tests/test/tcustomattr10.pp svneol=native#text/pascal
+tests/test/tcustomattr2.pp svneol=native#text/pascal
+tests/test/tcustomattr3.pp svneol=native#text/pascal
+tests/test/tcustomattr4.pp svneol=native#text/pascal
+tests/test/tcustomattr5.pp svneol=native#text/pascal
+tests/test/tcustomattr6.pp svneol=native#text/pascal
+tests/test/tcustomattr7.pp svneol=native#text/pascal
+tests/test/tcustomattr8.pp svneol=native#text/pascal
+tests/test/tcustomattr9.pp svneol=native#text/pascal
 tests/test/tdefault1.pp svneol=native#text/pascal
 tests/test/tdefault10.pp svneol=native#text/pascal
 tests/test/tdefault11.pp svneol=native#text/pascal
diff --git a/tests/test/tclassattribute1.pp b/tests/test/tcustomattr1.pp
similarity index 95%
rename from tests/test/tclassattribute1.pp
rename to tests/test/tcustomattr1.pp
index ef0b499465..6c1f37062e 100644
--- a/tests/test/tclassattribute1.pp
+++ b/tests/test/tcustomattr1.pp
@@ -1,4 +1,4 @@
-program tclassattribute1;
+program tcustomattr1;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute10.pp b/tests/test/tcustomattr10.pp
similarity index 95%
rename from tests/test/tclassattribute10.pp
rename to tests/test/tcustomattr10.pp
index 36f01e97b4..14a579f74d 100644
--- a/tests/test/tclassattribute10.pp
+++ b/tests/test/tcustomattr10.pp
@@ -1,4 +1,4 @@
-program tclassattribute10;
+program tcustomattr10;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute2.pp b/tests/test/tcustomattr2.pp
similarity index 91%
rename from tests/test/tclassattribute2.pp
rename to tests/test/tcustomattr2.pp
index 3b5cd8055f..92425b885e 100644
--- a/tests/test/tclassattribute2.pp
+++ b/tests/test/tcustomattr2.pp
@@ -1,5 +1,5 @@
 { %fail }
-program tclassattribute2;
+program tcustomattr2;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute3.pp b/tests/test/tcustomattr3.pp
similarity index 90%
rename from tests/test/tclassattribute3.pp
rename to tests/test/tcustomattr3.pp
index 41a968a23d..ba7088295c 100644
--- a/tests/test/tclassattribute3.pp
+++ b/tests/test/tcustomattr3.pp
@@ -1,5 +1,5 @@
 { %fail }
-program tclassattribute3;
+program tcustomattr3;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute4.pp b/tests/test/tcustomattr4.pp
similarity index 96%
rename from tests/test/tclassattribute4.pp
rename to tests/test/tcustomattr4.pp
index d555ebcf0d..3d24636400 100644
--- a/tests/test/tclassattribute4.pp
+++ b/tests/test/tcustomattr4.pp
@@ -1,4 +1,4 @@
-program tclassattribute4;
+program tcustomattr4;
 
 {$mode delphi}
 
diff --git a/tests/test/tclassattribute5.pp b/tests/test/tcustomattr5.pp
similarity index 94%
rename from tests/test/tclassattribute5.pp
rename to tests/test/tcustomattr5.pp
index ea73121871..11e203aafa 100644
--- a/tests/test/tclassattribute5.pp
+++ b/tests/test/tcustomattr5.pp
@@ -1,5 +1,5 @@
 { %fail }
-program tclassattribute5;
+program tcustomattr5;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute6.pp b/tests/test/tcustomattr6.pp
similarity index 96%
rename from tests/test/tclassattribute6.pp
rename to tests/test/tcustomattr6.pp
index 8734302f98..425b7da6a5 100644
--- a/tests/test/tclassattribute6.pp
+++ b/tests/test/tcustomattr6.pp
@@ -1,4 +1,4 @@
-program tclassattribute6;
+program tcustomattr6;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute7.pp b/tests/test/tcustomattr7.pp
similarity index 94%
rename from tests/test/tclassattribute7.pp
rename to tests/test/tcustomattr7.pp
index b7864efc70..45d8f5b807 100644
--- a/tests/test/tclassattribute7.pp
+++ b/tests/test/tcustomattr7.pp
@@ -1,5 +1,5 @@
 { %fail }
-program tclassattribute7;
+program tcustomattr7;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute8.pp b/tests/test/tcustomattr8.pp
similarity index 94%
rename from tests/test/tclassattribute8.pp
rename to tests/test/tcustomattr8.pp
index 1c87949f9b..ec223c38c6 100644
--- a/tests/test/tclassattribute8.pp
+++ b/tests/test/tcustomattr8.pp
@@ -1,5 +1,5 @@
 { %fail }
-program tclassattribute8;
+program tcustomattr8;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}
diff --git a/tests/test/tclassattribute9.pp b/tests/test/tcustomattr9.pp
similarity index 94%
rename from tests/test/tclassattribute9.pp
rename to tests/test/tcustomattr9.pp
index ed07789024..9737327a1d 100644
--- a/tests/test/tclassattribute9.pp
+++ b/tests/test/tcustomattr9.pp
@@ -1,4 +1,4 @@
-program tclassattribute9;
+program tcustomattr9;
 
 {$mode objfpc}{$H+}
 {$modeswitch prefixedattributes}