From 05faf7d3ea82d4f8bb59c92039355ed9bde248cb Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andrei@andy314.com>
Date: Mon, 30 Nov 2020 21:01:07 -0500
Subject: [PATCH] Rename TestUtils to UnitTestRegistration. (#4021)

Looking to remove usage of 'Utils' unless we have really no choice.
'UnitTestRegistration' seems clearer in what it does compared to
'TestUtils'.
---
 src/app/tests/TestMessageDef.cpp                            | 2 +-
 src/ble/tests/TestBleErrorStr.cpp                           | 2 +-
 src/ble/tests/TestBleUUID.cpp                               | 2 +-
 src/crypto/tests/CHIPCryptoPALTest.cpp                      | 2 +-
 src/inet/tests/TestInetAddress.cpp                          | 2 +-
 src/inet/tests/TestInetEndPoint.cpp                         | 2 +-
 src/inet/tests/TestInetErrorStr.cpp                         | 2 +-
 src/inet/tests/TestInetLayerDNS.cpp                         | 2 +-
 src/lib/core/tests/TestCHIPCallback.cpp                     | 2 +-
 src/lib/core/tests/TestCHIPErrorStr.cpp                     | 2 +-
 src/lib/core/tests/TestCHIPTLV.cpp                          | 2 +-
 src/lib/core/tests/TestReferenceCounted.cpp                 | 2 +-
 src/lib/mdns/minimal/tests/TestIPResourceRecord.cpp         | 2 +-
 src/lib/mdns/minimal/tests/TestQName.cpp                    | 2 +-
 src/lib/mdns/minimal/tests/TestRecordData.cpp               | 2 +-
 src/lib/mdns/minimal/tests/TestResourceRecord.cpp           | 2 +-
 src/lib/shell/tests/TestShell.cpp                           | 2 +-
 src/lib/shell/tests/TestStreamerStdio.cpp                   | 2 +-
 src/lib/support/BUILD.gn                                    | 4 ++--
 src/lib/support/{TestUtils.cpp => UnitTestRegistration.cpp} | 2 +-
 src/lib/support/{TestUtils.h => UnitTestRegistration.h}     | 0
 src/lib/support/tests/TestBufBound.cpp                      | 2 +-
 src/lib/support/tests/TestBufferReader.cpp                  | 2 +-
 src/lib/support/tests/TestCHIPCounter.cpp                   | 2 +-
 src/lib/support/tests/TestCHIPMem.cpp                       | 2 +-
 src/lib/support/tests/TestSafeInt.cpp                       | 2 +-
 src/lib/support/tests/TestScopedBuffer.cpp                  | 2 +-
 src/lib/support/tests/TestSerializableIntegerSet.cpp        | 2 +-
 src/platform/tests/TestConfigurationMgr.cpp                 | 2 +-
 src/platform/tests/TestPlatformTime.cpp                     | 2 +-
 src/protocols/bdx/tests/TestBdxMessages.cpp                 | 2 +-
 src/system/tests/TestSystemErrorStr.cpp                     | 2 +-
 src/system/tests/TestSystemObject.cpp                       | 2 +-
 src/system/tests/TestSystemPacketBuffer.cpp                 | 2 +-
 src/system/tests/TestSystemTimer.cpp                        | 2 +-
 src/system/tests/TestSystemWakeEvent.cpp                    | 2 +-
 src/system/tests/TestTimeSource.cpp                         | 2 +-
 src/test_driver/esp32/main/main_app.cpp                     | 2 +-
 src/test_driver/nrfconnect/main/runner.cpp                  | 2 +-
 src/transport/raw/tests/TestMessageHeader.cpp               | 2 +-
 src/transport/raw/tests/TestTCP.cpp                         | 2 +-
 src/transport/raw/tests/TestUDP.cpp                         | 2 +-
 src/transport/retransmit/tests/TestCache.cpp                | 2 +-
 src/transport/tests/TestPeerConnections.cpp                 | 2 +-
 src/transport/tests/TestSecurePairingSession.cpp            | 2 +-
 src/transport/tests/TestSecureSession.cpp                   | 2 +-
 46 files changed, 46 insertions(+), 46 deletions(-)
 rename src/lib/support/{TestUtils.cpp => UnitTestRegistration.cpp} (97%)
 rename src/lib/support/{TestUtils.h => UnitTestRegistration.h} (100%)

diff --git a/src/app/tests/TestMessageDef.cpp b/src/app/tests/TestMessageDef.cpp
index 51ae2b1c92ccc0..14bf7b2992bc51 100644
--- a/src/app/tests/TestMessageDef.cpp
+++ b/src/app/tests/TestMessageDef.cpp
@@ -24,7 +24,7 @@
 
 #include <app/MessageDef.h>
 #include <core/CHIPTLVDebug.hpp>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <system/SystemPacketBuffer.h>
 
 #include <nlunit-test.h>
diff --git a/src/ble/tests/TestBleErrorStr.cpp b/src/ble/tests/TestBleErrorStr.cpp
index 428816af563019..d62c266701981c 100644
--- a/src/ble/tests/TestBleErrorStr.cpp
+++ b/src/ble/tests/TestBleErrorStr.cpp
@@ -40,7 +40,7 @@
 
 #include <ble/BleError.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/ble/tests/TestBleUUID.cpp b/src/ble/tests/TestBleUUID.cpp
index ffb3b93d3efe55..068ae61678145d 100644
--- a/src/ble/tests/TestBleUUID.cpp
+++ b/src/ble/tests/TestBleUUID.cpp
@@ -27,7 +27,7 @@
 #include "TestBleLayer.h"
 
 #include <ble/BleUUID.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/crypto/tests/CHIPCryptoPALTest.cpp b/src/crypto/tests/CHIPCryptoPALTest.cpp
index 58338ae9d3fe34..0c27c6531a5a3b 100644
--- a/src/crypto/tests/CHIPCryptoPALTest.cpp
+++ b/src/crypto/tests/CHIPCryptoPALTest.cpp
@@ -39,7 +39,7 @@
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>
 #include <support/ScopedBuffer.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <stdarg.h>
 #include <stdint.h>
diff --git a/src/inet/tests/TestInetAddress.cpp b/src/inet/tests/TestInetAddress.cpp
index 5e82290cbcc53e..178148d75080b5 100644
--- a/src/inet/tests/TestInetAddress.cpp
+++ b/src/inet/tests/TestInetAddress.cpp
@@ -46,7 +46,7 @@
 #include <inet/IPPrefix.h>
 
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 using namespace chip;
 using namespace chip::Inet;
diff --git a/src/inet/tests/TestInetEndPoint.cpp b/src/inet/tests/TestInetEndPoint.cpp
index d184c13c738966..681b5d1b094153 100644
--- a/src/inet/tests/TestInetEndPoint.cpp
+++ b/src/inet/tests/TestInetEndPoint.cpp
@@ -40,7 +40,7 @@
 
 #include <support/CHIPArgParser.hpp>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <system/SystemError.h>
 #include <system/SystemTimer.h>
diff --git a/src/inet/tests/TestInetErrorStr.cpp b/src/inet/tests/TestInetErrorStr.cpp
index 528cecd5dd37a0..fa95072c059636 100644
--- a/src/inet/tests/TestInetErrorStr.cpp
+++ b/src/inet/tests/TestInetErrorStr.cpp
@@ -39,7 +39,7 @@
 #include <inet/InetError.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/inet/tests/TestInetLayerDNS.cpp b/src/inet/tests/TestInetLayerDNS.cpp
index 5df0e464fe05c8..0c00af648f048b 100644
--- a/src/inet/tests/TestInetLayerDNS.cpp
+++ b/src/inet/tests/TestInetLayerDNS.cpp
@@ -38,7 +38,7 @@
 
 #include <inet/InetLayer.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <system/SystemClock.h>
 #include <system/SystemTimer.h>
diff --git a/src/lib/core/tests/TestCHIPCallback.cpp b/src/lib/core/tests/TestCHIPCallback.cpp
index a8c8df63e640cc..d1422534bb140c 100644
--- a/src/lib/core/tests/TestCHIPCallback.cpp
+++ b/src/lib/core/tests/TestCHIPCallback.cpp
@@ -26,7 +26,7 @@
 
 #include <core/CHIPCallback.h>
 #include <support/CHIPMem.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
index ae5a2272bed4cd..fa67b69f5b837a 100644
--- a/src/lib/core/tests/TestCHIPErrorStr.cpp
+++ b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -40,7 +40,7 @@
 
 #include <core/CHIPError.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/core/tests/TestCHIPTLV.cpp b/src/lib/core/tests/TestCHIPTLV.cpp
index 671d0fb735e2f5..346aeb7cfc8711 100644
--- a/src/lib/core/tests/TestCHIPTLV.cpp
+++ b/src/lib/core/tests/TestCHIPTLV.cpp
@@ -39,7 +39,7 @@
 #include <support/CodeUtils.h>
 #include <support/RandUtils.h>
 #include <support/ScopedBuffer.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <string.h>
 
diff --git a/src/lib/core/tests/TestReferenceCounted.cpp b/src/lib/core/tests/TestReferenceCounted.cpp
index 77a9af59cc5f8e..74a73670fe69ec 100644
--- a/src/lib/core/tests/TestReferenceCounted.cpp
+++ b/src/lib/core/tests/TestReferenceCounted.cpp
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include <lib/core/ReferenceCounted.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/mdns/minimal/tests/TestIPResourceRecord.cpp b/src/lib/mdns/minimal/tests/TestIPResourceRecord.cpp
index 426236617df132..a327224e3f7625 100644
--- a/src/lib/mdns/minimal/tests/TestIPResourceRecord.cpp
+++ b/src/lib/mdns/minimal/tests/TestIPResourceRecord.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <mdns/minimal/IPResourceRecord.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/mdns/minimal/tests/TestQName.cpp b/src/lib/mdns/minimal/tests/TestQName.cpp
index fadb25559588fe..ab9e1b45035fd7 100644
--- a/src/lib/mdns/minimal/tests/TestQName.cpp
+++ b/src/lib/mdns/minimal/tests/TestQName.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <mdns/minimal/QName.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/mdns/minimal/tests/TestRecordData.cpp b/src/lib/mdns/minimal/tests/TestRecordData.cpp
index 9beb0c9796a73f..c9a48243b0f081 100644
--- a/src/lib/mdns/minimal/tests/TestRecordData.cpp
+++ b/src/lib/mdns/minimal/tests/TestRecordData.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/mdns/minimal/tests/TestResourceRecord.cpp b/src/lib/mdns/minimal/tests/TestResourceRecord.cpp
index 2c39d3f4deb0cb..8c1b51f06e8654 100644
--- a/src/lib/mdns/minimal/tests/TestResourceRecord.cpp
+++ b/src/lib/mdns/minimal/tests/TestResourceRecord.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <mdns/minimal/ResourceRecord.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/shell/tests/TestShell.cpp b/src/lib/shell/tests/TestShell.cpp
index 7ec650db1a48c5..73054861176a86 100644
--- a/src/lib/shell/tests/TestShell.cpp
+++ b/src/lib/shell/tests/TestShell.cpp
@@ -19,7 +19,7 @@
 
 #include <shell/shell.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <inttypes.h>
 #include <stdarg.h>
diff --git a/src/lib/shell/tests/TestStreamerStdio.cpp b/src/lib/shell/tests/TestStreamerStdio.cpp
index 521e1f861df233..97e871b81289c0 100644
--- a/src/lib/shell/tests/TestStreamerStdio.cpp
+++ b/src/lib/shell/tests/TestStreamerStdio.cpp
@@ -19,7 +19,7 @@
 
 #include <shell/shell.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <inttypes.h>
 #include <stdarg.h>
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 4a5fa01238708f..05d0398741a35c 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -73,10 +73,10 @@ static_library("support") {
     "SafeInt.h",
     "SerializableIntegerSet.cpp",
     "SerializableIntegerSet.h",
-    "TestUtils.cpp",
-    "TestUtils.h",
     "TimeUtils.cpp",
     "TimeUtils.h",
+    "UnitTestRegistration.cpp",
+    "UnitTestRegistration.h",
     "logging/CHIPLogging.cpp",
     "logging/CHIPLogging.h",
     "logging/CHIPLoggingLogV.cpp",
diff --git a/src/lib/support/TestUtils.cpp b/src/lib/support/UnitTestRegistration.cpp
similarity index 97%
rename from src/lib/support/TestUtils.cpp
rename to src/lib/support/UnitTestRegistration.cpp
index 0afec3068680b6..8bfe8ecf99e970 100644
--- a/src/lib/support/TestUtils.cpp
+++ b/src/lib/support/UnitTestRegistration.cpp
@@ -17,7 +17,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 namespace chip {
 
diff --git a/src/lib/support/TestUtils.h b/src/lib/support/UnitTestRegistration.h
similarity index 100%
rename from src/lib/support/TestUtils.h
rename to src/lib/support/UnitTestRegistration.h
diff --git a/src/lib/support/tests/TestBufBound.cpp b/src/lib/support/tests/TestBufBound.cpp
index 0117eae238b7c6..3889fd5c23423b 100644
--- a/src/lib/support/tests/TestBufBound.cpp
+++ b/src/lib/support/tests/TestBufBound.cpp
@@ -25,7 +25,7 @@
 #include "TestSupport.h"
 
 #include <support/BufBound.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/support/tests/TestBufferReader.cpp b/src/lib/support/tests/TestBufferReader.cpp
index ab14ffc5cae121..ef1ff71ecd57ba 100644
--- a/src/lib/support/tests/TestBufferReader.cpp
+++ b/src/lib/support/tests/TestBufferReader.cpp
@@ -25,7 +25,7 @@
 #include "TestSupport.h"
 
 #include <support/BufferReader.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <type_traits>
 
 #include <nlunit-test.h>
diff --git a/src/lib/support/tests/TestCHIPCounter.cpp b/src/lib/support/tests/TestCHIPCounter.cpp
index 66c281261c858e..6bba317a36c7bd 100644
--- a/src/lib/support/tests/TestCHIPCounter.cpp
+++ b/src/lib/support/tests/TestCHIPCounter.cpp
@@ -19,7 +19,7 @@
 #include <nlunit-test.h>
 
 #include <support/CHIPCounter.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 static void CheckStartWithZero(nlTestSuite * inSuite, void * inContext)
 {
diff --git a/src/lib/support/tests/TestCHIPMem.cpp b/src/lib/support/tests/TestCHIPMem.cpp
index ae6ff6e05f5d28..6d2c69f96be0a3 100644
--- a/src/lib/support/tests/TestCHIPMem.cpp
+++ b/src/lib/support/tests/TestCHIPMem.cpp
@@ -34,7 +34,7 @@
 #include <nlunit-test.h>
 #include <support/CHIPMem.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 using namespace chip;
 using namespace chip::Logging;
diff --git a/src/lib/support/tests/TestSafeInt.cpp b/src/lib/support/tests/TestSafeInt.cpp
index 18c681a84d8f7a..e55b7f6307d5ad 100644
--- a/src/lib/support/tests/TestSafeInt.cpp
+++ b/src/lib/support/tests/TestSafeInt.cpp
@@ -25,7 +25,7 @@
 #include "TestSupport.h"
 
 #include <support/SafeInt.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/support/tests/TestScopedBuffer.cpp b/src/lib/support/tests/TestScopedBuffer.cpp
index eb7694466cc321..73bfc1b69cda9e 100644
--- a/src/lib/support/tests/TestScopedBuffer.cpp
+++ b/src/lib/support/tests/TestScopedBuffer.cpp
@@ -19,7 +19,7 @@
 #include "TestSupport.h"
 
 #include <support/ScopedBuffer.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/lib/support/tests/TestSerializableIntegerSet.cpp b/src/lib/support/tests/TestSerializableIntegerSet.cpp
index 0fdffec06663fc..4fc9907cb011bb 100644
--- a/src/lib/support/tests/TestSerializableIntegerSet.cpp
+++ b/src/lib/support/tests/TestSerializableIntegerSet.cpp
@@ -21,7 +21,7 @@
 #include <support/CHIPMem.h>
 #include <support/CHIPMemString.h>
 #include <support/SerializableIntegerSet.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/platform/tests/TestConfigurationMgr.cpp b/src/platform/tests/TestConfigurationMgr.cpp
index cf77b23b587700..e0009d4de193ef 100644
--- a/src/platform/tests/TestConfigurationMgr.cpp
+++ b/src/platform/tests/TestConfigurationMgr.cpp
@@ -33,7 +33,7 @@
 #include <nlunit-test.h>
 #include <support/CHIPMem.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <platform/CHIPDeviceLayer.h>
 
diff --git a/src/platform/tests/TestPlatformTime.cpp b/src/platform/tests/TestPlatformTime.cpp
index 2c2b33507e8bc2..6b6a89508cbe52 100644
--- a/src/platform/tests/TestPlatformTime.cpp
+++ b/src/platform/tests/TestPlatformTime.cpp
@@ -32,7 +32,7 @@
 
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <system/SystemClock.h>
 
 #include <platform/internal/CHIPDeviceLayerInternal.h>
diff --git a/src/protocols/bdx/tests/TestBdxMessages.cpp b/src/protocols/bdx/tests/TestBdxMessages.cpp
index c77641e06adc9b..87bc36b9998290 100644
--- a/src/protocols/bdx/tests/TestBdxMessages.cpp
+++ b/src/protocols/bdx/tests/TestBdxMessages.cpp
@@ -4,7 +4,7 @@
 
 #include <support/BufBound.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <limits>
 
diff --git a/src/system/tests/TestSystemErrorStr.cpp b/src/system/tests/TestSystemErrorStr.cpp
index df8ef6707ec8a3..ad0ad26b02ef0f 100644
--- a/src/system/tests/TestSystemErrorStr.cpp
+++ b/src/system/tests/TestSystemErrorStr.cpp
@@ -41,7 +41,7 @@
 #include <inet/InetError.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/system/tests/TestSystemObject.cpp b/src/system/tests/TestSystemObject.cpp
index 5adb416bdf5fc5..d1c2466d3d2543 100644
--- a/src/system/tests/TestSystemObject.cpp
+++ b/src/system/tests/TestSystemObject.cpp
@@ -41,7 +41,7 @@
 
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <nlunit-test.h>
 
diff --git a/src/system/tests/TestSystemPacketBuffer.cpp b/src/system/tests/TestSystemPacketBuffer.cpp
index 2b0b3e138a4ec6..288c9df1b48e64 100644
--- a/src/system/tests/TestSystemPacketBuffer.cpp
+++ b/src/system/tests/TestSystemPacketBuffer.cpp
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <system/SystemPacketBuffer.h>
 
 #if CHIP_SYSTEM_CONFIG_USE_LWIP
diff --git a/src/system/tests/TestSystemTimer.cpp b/src/system/tests/TestSystemTimer.cpp
index 3cb1a33482381a..97851f9ef9fcad 100644
--- a/src/system/tests/TestSystemTimer.cpp
+++ b/src/system/tests/TestSystemTimer.cpp
@@ -35,7 +35,7 @@
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <system/SystemError.h>
 #include <system/SystemLayer.h>
 #include <system/SystemTimer.h>
diff --git a/src/system/tests/TestSystemWakeEvent.cpp b/src/system/tests/TestSystemWakeEvent.cpp
index 1a58ac2af84243..966809c8c36315 100644
--- a/src/system/tests/TestSystemWakeEvent.cpp
+++ b/src/system/tests/TestSystemWakeEvent.cpp
@@ -33,7 +33,7 @@
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <system/SystemError.h>
 #include <system/SystemLayer.h>
 #include <system/SystemWakeEvent.h>
diff --git a/src/system/tests/TestTimeSource.cpp b/src/system/tests/TestTimeSource.cpp
index f0d594b5eda3c6..b4afd0e4105b8d 100644
--- a/src/system/tests/TestTimeSource.cpp
+++ b/src/system/tests/TestTimeSource.cpp
@@ -33,7 +33,7 @@
 #include <nlunit-test.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <system/TimeSource.h>
 
 namespace {
diff --git a/src/test_driver/esp32/main/main_app.cpp b/src/test_driver/esp32/main/main_app.cpp
index ea54197fee6874..af2dd6c66b656f 100644
--- a/src/test_driver/esp32/main/main_app.cpp
+++ b/src/test_driver/esp32/main/main_app.cpp
@@ -31,7 +31,7 @@
 #include <crypto/CHIPCryptoPAL.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
diff --git a/src/test_driver/nrfconnect/main/runner.cpp b/src/test_driver/nrfconnect/main/runner.cpp
index 6cbf94e52291cc..f5369962bed453 100644
--- a/src/test_driver/nrfconnect/main/runner.cpp
+++ b/src/test_driver/nrfconnect/main/runner.cpp
@@ -18,7 +18,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 #include <logging/log.h>
 #include <settings/settings.h>
diff --git a/src/transport/raw/tests/TestMessageHeader.cpp b/src/transport/raw/tests/TestMessageHeader.cpp
index fa8c6b52bff1ce..fd6cfb1df91cf7 100644
--- a/src/transport/raw/tests/TestMessageHeader.cpp
+++ b/src/transport/raw/tests/TestMessageHeader.cpp
@@ -24,7 +24,7 @@
  */
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <transport/raw/MessageHeader.h>
 
 #include <nlunit-test.h>
diff --git a/src/transport/raw/tests/TestTCP.cpp b/src/transport/raw/tests/TestTCP.cpp
index da9ca78afa44e8..580da1b0db92bf 100644
--- a/src/transport/raw/tests/TestTCP.cpp
+++ b/src/transport/raw/tests/TestTCP.cpp
@@ -25,7 +25,7 @@
 
 #include <core/CHIPCore.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <transport/raw/TCP.h>
 
 #include <nlbyteorder.h>
diff --git a/src/transport/raw/tests/TestUDP.cpp b/src/transport/raw/tests/TestUDP.cpp
index b301f464f13932..38a52b9c3d4c20 100644
--- a/src/transport/raw/tests/TestUDP.cpp
+++ b/src/transport/raw/tests/TestUDP.cpp
@@ -25,7 +25,7 @@
 
 #include <core/CHIPCore.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <transport/raw/UDP.h>
 
 #include <nlbyteorder.h>
diff --git a/src/transport/retransmit/tests/TestCache.cpp b/src/transport/retransmit/tests/TestCache.cpp
index b721c929584d4e..54a1fd4dd97012 100644
--- a/src/transport/retransmit/tests/TestCache.cpp
+++ b/src/transport/retransmit/tests/TestCache.cpp
@@ -17,7 +17,7 @@
 
 #include "TestRetransmit.h"
 
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <transport/retransmit/Cache.h>
 
 #include <bitset>
diff --git a/src/transport/tests/TestPeerConnections.cpp b/src/transport/tests/TestPeerConnections.cpp
index 6700f9da99a67f..a0c9ad61896fac 100644
--- a/src/transport/tests/TestPeerConnections.cpp
+++ b/src/transport/tests/TestPeerConnections.cpp
@@ -26,7 +26,7 @@
 
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <transport/PeerConnections.h>
 
 #include <nlunit-test.h>
diff --git a/src/transport/tests/TestSecurePairingSession.cpp b/src/transport/tests/TestSecurePairingSession.cpp
index 809caf0f028666..bdf197079c48fb 100644
--- a/src/transport/tests/TestSecurePairingSession.cpp
+++ b/src/transport/tests/TestSecurePairingSession.cpp
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 #include <support/CHIPMem.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 #include <transport/SecurePairingSession.h>
 
 using namespace chip;
diff --git a/src/transport/tests/TestSecureSession.cpp b/src/transport/tests/TestSecureSession.cpp
index 9f11820580838f..6bfcfc5b282ad5 100644
--- a/src/transport/tests/TestSecureSession.cpp
+++ b/src/transport/tests/TestSecureSession.cpp
@@ -31,7 +31,7 @@
 
 #include <stdarg.h>
 #include <support/CodeUtils.h>
-#include <support/TestUtils.h>
+#include <support/UnitTestRegistration.h>
 
 using namespace chip;
 using namespace Crypto;