Index: flang/unittests/CMakeLists.txt
===================================================================
--- flang/unittests/CMakeLists.txt
+++ flang/unittests/CMakeLists.txt
@@ -1,3 +1,12 @@
+add_custom_target(check-flang-unit)
+set_target_properties(check-flang-unit PROPERTIES FOLDER "Flang Unit Tests")
+
+function(add_flang_unittest test_dirname)
+  add_unittest(check-flang-unit ${test_dirname} ${ARGN})
+endfunction()
+
+add_subdirectory(Optimizer)
+
 add_subdirectory(Decimal)
 add_subdirectory(Evaluate)
 add_subdirectory(Runtime)
Index: flang/unittests/Optimizer/CMakeLists.txt
===================================================================
--- /dev/null
+++ flang/unittests/Optimizer/CMakeLists.txt
@@ -0,0 +1,13 @@
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+set(LIBS
+  FIRDialect
+  ${dialect_libs}
+)
+
+add_flang_unittest(FlangOptimizerTests
+  InternalNamesTest.cpp
+)
+target_link_libraries(FlangOptimizerTests
+  PRIVATE
+  ${LIBS})
Index: flang/unittests/Optimizer/InternalNamesTest.cpp
===================================================================
--- /dev/null
+++ flang/unittests/Optimizer/InternalNamesTest.cpp
@@ -0,0 +1,18 @@
+#include "flang/Optimizer/Support/InternalNames.h"
+#include <gtest/gtest.h>
+
+using namespace fir;
+using namespace llvm;
+
+TEST(genericName, MyTest) {
+        NameUniquer obj;
+        std::string val = obj.doCommonBlock("hello");
+	std::string val2 = "hello";
+	EXPECT_EQ(val, val2);
+}
+
+int main(int argc, char **argv) {
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
+