diff --git a/cmake/CompileBoost.cmake b/cmake/CompileBoost.cmake
index d73d0ab024..42bc5770dd 100644
--- a/cmake/CompileBoost.cmake
+++ b/cmake/CompileBoost.cmake
@@ -123,7 +123,7 @@ set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores an
 
 if(Boost_FOUND AND Boost_filesystem_FOUND AND Boost_context_FOUND AND NOT FORCE_BOOST_BUILD)
   add_library(boost_target INTERFACE)
-  target_link_libraries(boost_target INTERFACE Boost::boost Boost::context_FOUND Boost::filesystem)
+  target_link_libraries(boost_target INTERFACE Boost::boost Boost::context Boost::filesystem)
 elseif(WIN32)
   message(FATAL_ERROR "Could not find Boost")
 else()
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index f2da5835fc..e34743d00a 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -5,3 +5,4 @@ if(NOT WIN32)
   add_subdirectory(TraceLogHelper)
   add_subdirectory(TestHarness)
 endif()
+add_subdirectory(mockkms)
diff --git a/contrib/mockkms/CMakeLists.txt b/contrib/mockkms/CMakeLists.txt
new file mode 100644
index 0000000000..d5a79652d0
--- /dev/null
+++ b/contrib/mockkms/CMakeLists.txt
@@ -0,0 +1,18 @@
+if(WITH_GO_BINDING)
+  set(MOCK_KMS_SRC fault_injection.go get_encryption_keys.go mock_kms.go utils.go)
+  set(MOCK_KMS_TEST_SRC ${MOCK_KMS_SRC} mockkms_test.go)
+  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/mockkms
+    COMMAND go build -o ${CMAKE_BINARY_DIR}/bin/mockkms ${MOCK_KMS_SRC}
+    DEPENDS ${MOCK_KMS_SRC}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  add_custom_target(mockkms ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/mockkms)
+  fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/mockkms DESTINATION bin COMPONENT server)
+
+  add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/mockkms_test
+    COMMAND go test -c -o ${CMAKE_BINARY_DIR}/bin/mockkms_test ${MOCK_KMS_TEST_SRC}
+    DEPENDS ${MOCK_KMS_TEST_SRC}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  add_custom_target(mockkms_test ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/mockkms_test)
+  add_test(NAME mockkms COMMAND ${CMAKE_BINARY_DIR}/bin/mockkms_test)
+
+endif()
diff --git a/bindings/go/src/mockkms/fault_injection.go b/contrib/mockkms/fault_injection.go
similarity index 100%
rename from bindings/go/src/mockkms/fault_injection.go
rename to contrib/mockkms/fault_injection.go
diff --git a/bindings/go/src/mockkms/get_encryption_keys.go b/contrib/mockkms/get_encryption_keys.go
similarity index 100%
rename from bindings/go/src/mockkms/get_encryption_keys.go
rename to contrib/mockkms/get_encryption_keys.go
diff --git a/bindings/go/src/mockkms/mock_kms.go b/contrib/mockkms/mock_kms.go
similarity index 100%
rename from bindings/go/src/mockkms/mock_kms.go
rename to contrib/mockkms/mock_kms.go
diff --git a/bindings/go/src/mockkms/mockkms_test.go b/contrib/mockkms/mockkms_test.go
similarity index 100%
rename from bindings/go/src/mockkms/mockkms_test.go
rename to contrib/mockkms/mockkms_test.go
diff --git a/bindings/go/src/mockkms/utils.go b/contrib/mockkms/utils.go
similarity index 100%
rename from bindings/go/src/mockkms/utils.go
rename to contrib/mockkms/utils.go