diff --git a/CMakeLists.txt b/CMakeLists.txt
index d260d8c00e..310e2a6576 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -694,7 +694,7 @@ if (NOT MIOPEN_REQ_LIBS_ONLY)
 endif()
 
 if (CK_EXPERIMENTAL_BUILDER)
-  add_subdirectory(experimental/builder/test)
+  add_subdirectory(experimental/builder)
 endif()
 
 if(CK_USE_CODEGEN AND (SUPPORTED_GPU_TARGETS MATCHES "gfx9" OR GPU_ARCHS))
diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
index 41e2fa2cc0..9336d47e71 100644
--- a/cmake/gtest.cmake
+++ b/cmake/gtest.cmake
@@ -1,3 +1,4 @@
+include_guard(GLOBAL)
 include(FetchContent)
 
 set(GOOGLETEST_DIR "" CACHE STRING "Location of local GoogleTest repo to build against")
diff --git a/experimental/builder/CMakeLists.txt b/experimental/builder/CMakeLists.txt
new file mode 100644
index 0000000000..103acbad55
--- /dev/null
+++ b/experimental/builder/CMakeLists.txt
@@ -0,0 +1,3 @@
+if(BUILD_TESTING)
+    add_subdirectory(test)
+endif()
diff --git a/experimental/builder/include/ck_tile/builder/CMakeLists.txt b/experimental/builder/include/ck_tile/builder/CMakeLists.txt
new file mode 100644
index 0000000000..f20b5d54ec
--- /dev/null
+++ b/experimental/builder/include/ck_tile/builder/CMakeLists.txt
@@ -0,0 +1 @@
+# Empty placeholder until we add library code.