diff --git a/.gitattributes b/.gitattributes
index 79f7ef8e18..70aa8b0368 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11676,6 +11676,12 @@ tests/test/ttypedrecord1.pp svneol=native#text/plain
 tests/test/ttypedrecord2.pp svneol=native#text/plain
 tests/test/ttypedrecord3.pp svneol=native#text/plain
 tests/test/ttypedrecord4.pp svneol=native#text/plain
+tests/test/tudots.dot.next.pp svneol=native#text/pascal
+tests/test/tudots.dot.pp svneol=native#text/pascal
+tests/test/tudots.dot.prog.pp svneol=native#text/pascal
+tests/test/tudots.pp svneol=native#text/pascal
+tests/test/tudots.prog.pp svneol=native#text/pascal
+tests/test/tudots.test.pp svneol=native#text/pascal
 tests/test/tunaligned1.pp svneol=native#text/plain
 tests/test/tunistr1.pp svneol=native#text/plain
 tests/test/tunistr2.pp svneol=native#text/plain
@@ -11716,12 +11722,6 @@ tests/test/twrstr8.pp svneol=native#text/plain
 tests/test/uabstrcl.pp svneol=native#text/plain
 tests/test/uchlp12.pp svneol=native#text/pascal
 tests/test/uchlp18.pp svneol=native#text/pascal
-tests/test/udots.dot.next.pp svneol=native#text/pascal
-tests/test/udots.dot.pp svneol=native#text/pascal
-tests/test/udots.dot.prog.pp svneol=native#text/pascal
-tests/test/udots.pp svneol=native#text/pascal
-tests/test/udots.prog.pp svneol=native#text/pascal
-tests/test/udots.test.pp svneol=native#text/pascal
 tests/test/uenum2a.pp svneol=native#text/plain
 tests/test/uenum2b.pp svneol=native#text/plain
 tests/test/ugenconstraints.pas svneol=native#text/pascal
diff --git a/tests/test/tdotunits1.pp b/tests/test/tdotunits1.pp
index e8070923f9..2ec7c41644 100644
--- a/tests/test/tdotunits1.pp
+++ b/tests/test/tdotunits1.pp
@@ -5,10 +5,10 @@ program tdotunits1;
 {$mode delphi}
 
 uses
-  udots.dot.next, udots;
+  tudots.dot.next, tudots;
 
 begin
   // this identifier can't be resolved because namespace udots.dot hides the udots unit visibility
-  udots.dot.test := 1;
+  tudots.dot.test := 1;
 end.
 
diff --git a/tests/test/tdotunits2.pp b/tests/test/tdotunits2.pp
index f309617800..9fbc4d840e 100644
--- a/tests/test/tdotunits2.pp
+++ b/tests/test/tdotunits2.pp
@@ -3,15 +3,15 @@ program tdotunits2;
 {$mode delphi}
 
 uses
-  udots.dot, udots.dot.next, udots;
+  tudots.dot, tudots.dot.next, tudots;
 
 begin
   // this identifier should be resolved to test variable from udots.dot unit
-  udots.dot.test := 'a';
-  if udots.dot.test <> 'a' then
+  tudots.dot.test := 'a';
+  if tudots.dot.test <> 'a' then
     halt(1);
-  udots.dot.t;
-  if udots.dot.test <> 'c' then
+  tudots.dot.t;
+  if tudots.dot.test <> 'c' then
     halt(2);
 end.
 
diff --git a/tests/test/tdotunits3.pp b/tests/test/tdotunits3.pp
index 599164c1ba..5600d8bf5d 100644
--- a/tests/test/tdotunits3.pp
+++ b/tests/test/tdotunits3.pp
@@ -4,21 +4,21 @@ program tdotunits3;
 {$mode delphi}
 
 uses
-  udots.dot.next, udots;
+  tudots.dot.next, tudots;
 
 type
   TDot = record
     test: string;
   end;
 
-  TUdots = record
+  TUdots1 = record
     dot: TDot;
   end;
 
 var
-  udots: TUdots;
+  tudots: TUdots1;
 begin
   // this identifier should be resolved to local udots variable
-  udots.dot.test := 'test';
+  tudots.dot.test := 'test';
 end.
 
diff --git a/tests/test/tdotunits4.pp b/tests/test/tdotunits4.pp
index 4d8c4214a5..a3a22b4e39 100644
--- a/tests/test/tdotunits4.pp
+++ b/tests/test/tdotunits4.pp
@@ -5,7 +5,7 @@ program tdotunits4;
 {$mode delphi}
 
 uses
-  udots.test;
+  tudots.test;
 
 begin
 end.
diff --git a/tests/test/udots.dot.next.pp b/tests/test/tudots.dot.next.pp
similarity index 77%
rename from tests/test/udots.dot.next.pp
rename to tests/test/tudots.dot.next.pp
index cb10bf564c..6122eab003 100644
--- a/tests/test/udots.dot.next.pp
+++ b/tests/test/tudots.dot.next.pp
@@ -1,4 +1,4 @@
-unit udots.dot.next;
+unit tudots.dot.next;
 
 interface
 
diff --git a/tests/test/udots.dot.pp b/tests/test/tudots.dot.pp
similarity index 66%
rename from tests/test/udots.dot.pp
rename to tests/test/tudots.dot.pp
index e1f8b6faea..90607ff105 100644
--- a/tests/test/udots.dot.pp
+++ b/tests/test/tudots.dot.pp
@@ -1,4 +1,4 @@
-unit udots.dot;
+unit tudots.dot;
 
 interface
 
@@ -10,16 +10,16 @@ procedure t;
 implementation
 
 uses
-  udots, udots.dot.next;
+  tudots, tudots.dot.next;
 
 // test that type is resolved
 var
-  test1: udots.dot.next.ttest;
+  test1: tudots.dot.next.ttest;
 
 procedure t;
 begin
   // test that we resolved the next identifier to the local variable test
-  udots.dot.test := 'c';
+  tudots.dot.test := 'c';
 end;
 
 end.
diff --git a/tests/test/udots.dot.prog.pp b/tests/test/tudots.dot.prog.pp
similarity index 69%
rename from tests/test/udots.dot.prog.pp
rename to tests/test/tudots.dot.prog.pp
index 3a253b1c06..52a04b1e28 100644
--- a/tests/test/udots.dot.prog.pp
+++ b/tests/test/tudots.dot.prog.pp
@@ -1,15 +1,15 @@
 {%fail}
 {%norun}
-program udots.dot.prog;
+program tudots.dot.prog;
 
 {$mode delphi}
 
 uses
-  udots;
+  tudots;
 
 begin
   // this must fail because we have a namespace udots.dot and it has no unit test
-  udots.dot.test := 1;
+  tudots.dot.test := 1;
 end.
 
 
diff --git a/tests/test/udots.pp b/tests/test/tudots.pp
similarity index 85%
rename from tests/test/udots.pp
rename to tests/test/tudots.pp
index 676607c804..656dabe728 100644
--- a/tests/test/udots.pp
+++ b/tests/test/tudots.pp
@@ -1,4 +1,4 @@
-unit udots;
+unit tudots;
 
 interface
 
diff --git a/tests/test/udots.prog.pp b/tests/test/tudots.prog.pp
similarity index 69%
rename from tests/test/udots.prog.pp
rename to tests/test/tudots.prog.pp
index 6c2d810de5..bdb9d5e27c 100644
--- a/tests/test/udots.prog.pp
+++ b/tests/test/tudots.prog.pp
@@ -1,14 +1,14 @@
 {%norun}
-program udots.prog;
+program tudots.prog;
 
 {$mode delphi}
 
 uses
-  udots;
+  tudots;
 
 begin
   // this should not fail although we have a namespace udots and a unit udots
-  udots.dot.test := 1;
+  tudots.dot.test := 1;
 end.
 
 
diff --git a/tests/test/tudots.test.pp b/tests/test/tudots.test.pp
new file mode 100644
index 0000000000..ab1a3f1c4c
--- /dev/null
+++ b/tests/test/tudots.test.pp
@@ -0,0 +1,16 @@
+{ %fail }
+unit tudots.test;
+
+interface
+
+// this must fail
+var
+  test: tudots.dot.next.ttest;
+
+implementation
+
+uses
+  tudots.dot.next;
+
+end.
+
diff --git a/tests/test/udots.test.pp b/tests/test/udots.test.pp
deleted file mode 100644
index 2bd6c65ba2..0000000000
--- a/tests/test/udots.test.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-unit udots.test;
-
-interface
-
-// this must fail
-var
-  test: udots.dot.next.ttest;
-
-implementation
-
-uses
-  udots.dot.next;
-
-end.
-