diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf5ddc4..e10590c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,11 @@
 cmake_minimum_required(VERSION 3.10)
 include(FetchContent)
+include(GoogleTest)
 project(CPERParse)
 
+# GoogleTest requires at least C++14.
+set(CMAKE_CXX_STANDARD 14)
+
 # Output into subdirectories /lib and /bin.
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -21,7 +25,14 @@
   GIT_REPOSITORY https://github.com/jwerle/b64.c.git
   GIT_TAG        c33188cd541f19b072ee4988d8224ea6c964bed1 # 9/2/2021
 )
-FetchContent_MakeAvailable(json-c b64-c)
+
+# Fetch GoogleTest from git repository.
+FetchContent_Declare(
+  googletest
+  GIT_REPOSITORY https://github.com/google/googletest.git
+  GIT_TAG release-1.12.1
+)
+FetchContent_MakeAvailable(json-c b64-c googletest)
 
 # Add library and test executable.
 file(GLOB SectionSources sections/*.c)
@@ -29,13 +40,31 @@
 file(GLOB GeneratorSectionSources generator/sections/*.c)
 add_library(cper-parse STATIC cper-parse.c ir-parse.c cper-utils.c json-schema.c json-schema.h ${SectionSources} ${EDKSources})
 add_executable(cper-convert cli-app/cper-convert.c)
-add_executable(cper-generate generator/cper-generate.c generator/gen-utils.c ${GeneratorSectionSources} ${EDKSources})
+add_executable(cper-generate 
+  generator/cper-generate-cli.c
+  generator/cper-generate.c 
+  generator/gen-utils.c 
+  ${GeneratorSectionSources} 
+  ${EDKSources}
+)
+add_executable(cper-tests 
+  tests/ir-tests.cpp 
+  tests/test-utils.cpp
+  generator/cper-generate.c
+  generator/gen-utils.c 
+  ${GeneratorSectionSources} 
+  ${EDKSources}
+)
 
 # Link library.
+target_link_libraries(cper-tests cper-parse json-c GTest::gtest_main)
 target_link_libraries(cper-parse json-c b64c)
 target_link_libraries(cper-convert cper-parse)
 target_compile_options(cper-parse PRIVATE -Wno-address-of-packed-member)
 
 # Copy required specification JSON for command line application.
 add_custom_command(TARGET cper-convert POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory bin/specification)
-add_custom_command(TARGET cper-convert POST_BUILD COMMAND cp -r specification/json/* bin/specification)
\ No newline at end of file
+add_custom_command(TARGET cper-convert POST_BUILD COMMAND cp -r specification/json/* bin/specification)
+
+# Add tests to GoogleTest.
+#gtest_discover_tests(cper-tests WORKING_DIRECTORY bin/)
\ No newline at end of file