diff --git a/packages/hash/tests/tests.pp b/packages/hash/tests/tests.pp
index cd3a2f2316..28c9980498 100644
--- a/packages/hash/tests/tests.pp
+++ b/packages/hash/tests/tests.pp
@@ -5,7 +5,7 @@ program tests;
 {$mode objfpc}
 
 uses
-  consoletestrunner, TestsHMAC, testsha256, testonetimepass, sha512, testsha512, asn, ecc, pem, testpem, ecdsa;
+  consoletestrunner, UTestsHMAC, utestsha256, utestonetimepass, sha512, utestsha512, asn, ecc, pem, utestpem, ecdsa;
 
 var
   Application: TTestRunner;
diff --git a/packages/hash/tests/testonetimepass.pp b/packages/hash/tests/utestonetimepass.pp
similarity index 98%
rename from packages/hash/tests/testonetimepass.pp
rename to packages/hash/tests/utestonetimepass.pp
index 56b6c44ad7..fcb4c5b86e 100644
--- a/packages/hash/tests/testonetimepass.pp
+++ b/packages/hash/tests/utestonetimepass.pp
@@ -1,4 +1,4 @@
-unit testonetimepass;
+unit utestonetimepass;
 
 {$mode ObjFPC}{$H+}
 
diff --git a/packages/hash/tests/testpem.pp b/packages/hash/tests/utestpem.pp
similarity index 99%
rename from packages/hash/tests/testpem.pp
rename to packages/hash/tests/utestpem.pp
index dd1a359407..d9762555f0 100644
--- a/packages/hash/tests/testpem.pp
+++ b/packages/hash/tests/utestpem.pp
@@ -1,4 +1,4 @@
-unit testpem;
+unit utestpem;
 
 {$mode ObjFPC}{$H+}
 
diff --git a/packages/hash/tests/testsha256.pp b/packages/hash/tests/utestsha256.pp
similarity index 99%
rename from packages/hash/tests/testsha256.pp
rename to packages/hash/tests/utestsha256.pp
index e11a7e244e..4245b9bd12 100644
--- a/packages/hash/tests/testsha256.pp
+++ b/packages/hash/tests/utestsha256.pp
@@ -1,4 +1,4 @@
-unit testsha256;
+unit utestsha256;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/hash/tests/testsha512.pp b/packages/hash/tests/utestsha512.pp
similarity index 99%
rename from packages/hash/tests/testsha512.pp
rename to packages/hash/tests/utestsha512.pp
index e703980fa9..2634d82ea5 100644
--- a/packages/hash/tests/testsha512.pp
+++ b/packages/hash/tests/utestsha512.pp
@@ -1,4 +1,4 @@
-unit testsha512;
+unit utestsha512;
 
 {$mode objfpc}{$H+}
 
diff --git a/packages/hash/tests/testshmac.pas b/packages/hash/tests/utestshmac.pas
similarity index 99%
rename from packages/hash/tests/testshmac.pas
rename to packages/hash/tests/utestshmac.pas
index a69387d839..a4f7a933e1 100644
--- a/packages/hash/tests/testshmac.pas
+++ b/packages/hash/tests/utestshmac.pas
@@ -1,6 +1,6 @@
 // See all test cases in: http://tools.ietf.org/html/rfc2202
 
-unit TestsHMAC;
+unit UTestsHMAC;
 
 {$mode objfpc}{$H+}