diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ad307883ef..986701cb29 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -83,3 +83,5 @@ set (InventorBuilder_LIBS
 SETUP_TESTS(
     InventorBuilder
 )
+
+add_subdirectory(src)
diff --git a/tests/src/Base/CMakeLists.txt b/tests/src/Base/CMakeLists.txt
new file mode 100644
index 0000000000..801ea1432e
--- /dev/null
+++ b/tests/src/Base/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+add_executable(
+    Tests_Tools_run
+    tst_Tools.cpp
+)
+
+target_link_libraries(Tests_Tools_run gtest gtest_main ${Google_Tests_LIBS} FreeCADBase)
diff --git a/tests/src/Base/tst_Tools.cpp b/tests/src/Base/tst_Tools.cpp
new file mode 100644
index 0000000000..bb0914d6ac
--- /dev/null
+++ b/tests/src/Base/tst_Tools.cpp
@@ -0,0 +1,32 @@
+#include "gtest/gtest.h"
+#include <Base/Tools.h>
+
+TEST(BaseToolsSuite, TestUniqueName1)
+{
+    EXPECT_STREQ(Base::Tools::getUniqueName("Body", {}).c_str(), "Body");
+}
+
+TEST(BaseToolsSuite, TestUniqueName2)
+{
+    EXPECT_STREQ(Base::Tools::getUniqueName("Body", {"Body"}, 1).c_str(), "Body1");
+}
+
+TEST(BaseToolsSuite, TestUniqueName3)
+{
+    EXPECT_STREQ(Base::Tools::getUniqueName("Body", {"Body"}, 3).c_str(), "Body001");
+}
+
+TEST(BaseToolsSuite, TestUniqueName4)
+{
+    EXPECT_STREQ(Base::Tools::getUniqueName("Body", {"Body001"}, 3).c_str(), "Body002");
+}
+
+TEST(BaseToolsSuite, TestUniqueName5)
+{
+    EXPECT_STREQ(Base::Tools::getUniqueName("Body", {"Body001"}, 3).c_str(), "Body002");
+}
+
+TEST(BaseToolsSuite, TestUniqueName6)
+{
+    EXPECT_STREQ(Base::Tools::getUniqueName("Body001", {"Body", "Body001"}, 3).c_str(), "Body002");
+}
diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
new file mode 100644
index 0000000000..aef5792491
--- /dev/null
+++ b/tests/src/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(Base)