diff --git a/src/lib/shell/tests/BUILD.gn b/src/lib/shell/tests/BUILD.gn
index 12c15d84c531c7..0b5f7d5fd43222 100644
--- a/src/lib/shell/tests/BUILD.gn
+++ b/src/lib/shell/tests/BUILD.gn
@@ -14,11 +14,10 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
-import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/build/chip/chip_test_suite.gni")
 
-chip_test_suite_using_nltest("tests") {
+chip_test_suite("tests") {
   output_name = "libTestShell"
 
   test_sources = [
@@ -31,7 +30,5 @@ chip_test_suite_using_nltest("tests") {
   public_deps = [
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/shell",
-    "${chip_root}/src/lib/support:testing_nlunit",
-    "${nlunit_test_root}:nlunit-test",
   ]
 }
diff --git a/src/lib/shell/tests/TestShellStreamerStdio.cpp b/src/lib/shell/tests/TestShellStreamerStdio.cpp
index 170fc377e36e95..dde770c950183c 100644
--- a/src/lib/shell/tests/TestShellStreamerStdio.cpp
+++ b/src/lib/shell/tests/TestShellStreamerStdio.cpp
@@ -15,11 +15,10 @@
  *    limitations under the License.
  */
 
-#include <nlunit-test.h>
+#include <gtest/gtest.h>
 
 #include <lib/shell/Engine.h>
 #include <lib/support/CodeUtils.h>
-#include <lib/support/UnitTestRegistration.h>
 
 #include <inttypes.h>
 #include <stdarg.h>
@@ -48,7 +47,7 @@ static const struct test_streamer_vector test_vector_streamer_out[] = {
 //      Unit tests
 // =================================
 
-static void TestStreamer_Output(nlTestSuite * inSuite, void * inContext)
+TEST(TestShellStreamerStdio, TestStreamer_Output)
 {
     int numOfTestVectors = ArraySize(test_vector_streamer_out);
     int numOfTestsRan    = 0;
@@ -64,29 +63,8 @@ static void TestStreamer_Output(nlTestSuite * inSuite, void * inContext)
 
         num_chars = streamer_write(streamer_get(), output, strlen(output));
         // Let's assume that all our output lengths fit in ssize_t.
-        NL_TEST_ASSERT(inSuite, num_chars == static_cast<ssize_t>(strlen(output)));
+        EXPECT_EQ(num_chars, static_cast<ssize_t>(strlen(output)));
         numOfTestsRan++;
     }
-    NL_TEST_ASSERT(inSuite, numOfTestsRan > 0);
+    EXPECT_GT(numOfTestsRan, 0);
 }
-
-/**
- *   Test Suite. It lists all the test functions.
- */
-static const nlTest sTests[] = {
-
-    NL_TEST_DEF("Test Shell: TestStreamer_Output", TestStreamer_Output),
-
-    NL_TEST_SENTINEL()
-};
-
-int TestStreamerStdio()
-{
-    nlTestSuite theSuite = { "Test Shell: Streamer", &sTests[0], nullptr, nullptr };
-
-    // Run test suite against one context.
-    nlTestRunner(&theSuite, nullptr);
-    return nlTestRunnerStats(&theSuite);
-}
-
-CHIP_REGISTER_TEST_SUITE(TestStreamerStdio)
diff --git a/src/lib/shell/tests/TestShellTokenizeLine.cpp b/src/lib/shell/tests/TestShellTokenizeLine.cpp
index cbd0d751344670..8ed6c0eecde779 100644
--- a/src/lib/shell/tests/TestShellTokenizeLine.cpp
+++ b/src/lib/shell/tests/TestShellTokenizeLine.cpp
@@ -15,10 +15,9 @@
  *    limitations under the License.
  */
 
-#include <nlunit-test.h>
+#include <gtest/gtest.h>
 
 #include <lib/support/CodeUtils.h>
-#include <lib/support/UnitTestRegistration.h>
 
 // Include entire C++ file to have access to functions-under-test
 // such as TokenizeLine despite them being declared within an anonymous namespace.
@@ -99,7 +98,7 @@ static const struct test_shell_vector test_vector_shell_tokenizer[] = {
 //      Unit tests
 // =================================
 
-static void TestShell_Tokenizer(nlTestSuite * inSuite, void * inContext)
+TEST(TestShellTokenizeLine, TestShell_Tokenizer)
 {
     int numOfTestVectors = ArraySize(test_vector_shell_tokenizer);
     int numOfTestsRan    = 0;
@@ -115,34 +114,13 @@ static void TestShell_Tokenizer(nlTestSuite * inSuite, void * inContext)
         char * argv[TEST_SHELL_MAX_TOKENS];
         int argc = TokenizeLine(line, argv, TEST_SHELL_MAX_TOKENS);
 
-        NL_TEST_ASSERT(inSuite, argc == test_params->argc);
+        EXPECT_EQ(argc, test_params->argc);
 
         for (int i = 0; i < argc; i++)
         {
-            NL_TEST_ASSERT(inSuite, strcmp(argv[i], test_params->argv[i]) == 0);
+            EXPECT_EQ(strcmp(argv[i], test_params->argv[i]), 0);
         }
         numOfTestsRan++;
     }
-    NL_TEST_ASSERT(inSuite, numOfTestsRan > 0);
+    EXPECT_GT(numOfTestsRan, 0);
 }
-
-/**
- *   Test Suite. It lists all the test functions.
- */
-static const nlTest sTests[] = {
-
-    NL_TEST_DEF("Test Shell: TestShell_Tokenizer", TestShell_Tokenizer),
-
-    NL_TEST_SENTINEL()
-};
-
-int TestShellTokenizeLine()
-{
-    nlTestSuite theSuite = { "Test Shell: MainLoop", &sTests[0], nullptr, nullptr };
-
-    // Run test suite against one context.
-    nlTestRunner(&theSuite, nullptr);
-    return nlTestRunnerStats(&theSuite);
-}
-
-CHIP_REGISTER_TEST_SUITE(TestShellTokenizeLine)
diff --git a/src/test_driver/openiotsdk/unit-tests/test_components.txt b/src/test_driver/openiotsdk/unit-tests/test_components.txt
index bc9d77e48d075f..159b0e0f7bc3c9 100644
--- a/src/test_driver/openiotsdk/unit-tests/test_components.txt
+++ b/src/test_driver/openiotsdk/unit-tests/test_components.txt
@@ -1,2 +1,3 @@
 accesstest
 PlatformTests
+TestShell
diff --git a/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt b/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt
index 0e012ff3354f02..b12fa582e0d732 100644
--- a/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt
+++ b/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt
@@ -17,6 +17,5 @@ SecureChannelTests
 SetupPayloadTests
 SupportTests
 SystemLayerTests
-TestShell
 TransportLayerTests
 UserDirectedCommissioningTests