diff --git a/ext/ghoul b/ext/ghoul
index e45911445d..7779a2e87c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit e45911445d85b884baa017e175d6a175ca421d76
+Subproject commit 7779a2e87c178a2b0a59c03f71b909018b2c4d77
diff --git a/ext/sgct b/ext/sgct
index 9ad36dbaa5..fb95dc335b 160000
--- a/ext/sgct
+++ b/ext/sgct
@@ -1 +1 @@
-Subproject commit 9ad36dbaa55d5267556a32338f8776a85c463321
+Subproject commit fb95dc335ba7d396723fbfeca64aa3b7451376c8
diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake
index c4bef6ff1d..e8d06c459b 100644
--- a/support/cmake/support_macros.cmake
+++ b/support/cmake/support_macros.cmake
@@ -291,7 +291,15 @@ endfunction ()
 function (handle_option_tests)
     if (OPENSPACE_HAVE_TESTS)
         if (NOT TARGET gtest)
-            add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/gtest)
+            set(BUILD_GTEST ON CACHE BOOL "")
+            set(BUILD_GMOCK OFF CACHE BOOL "")
+            set(gtest_force_shared_crt ON CACHE BOOL "")
+            # set(BUILD_GMOCK OFF CACHE BOOL "")
+            # option(BUILD_GTEST "Builds the googletest subproject" CACHE ON)
+            # option(BUILD_GMOCK "Builds the googlemock subproject" CACHE OFF)
+            # option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." CACHE ON)
+            add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/googletest)
+            # add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/gtest)
             set_property(TARGET gtest PROPERTY FOLDER "External")
         endif ()
 
@@ -301,7 +309,7 @@ function (handle_option_tests)
         target_include_directories(OpenSpaceTest PUBLIC
             "${OPENSPACE_BASE_DIR}/include"
             "${OPENSPACE_BASE_DIR}/tests"
-            "${OPENSPACE_EXT_DIR}/ghoul/ext/gtest/include"
+            "${OPENSPACE_EXT_DIR}/ghoul/ext/googletest/googletest/include"
         )
         target_link_libraries(OpenSpaceTest gtest libOpenSpace)
 
@@ -316,7 +324,13 @@ function (handle_option_tests)
     endif (OPENSPACE_HAVE_TESTS)
     if (TARGET GhoulTest)
         if (NOT TARGET gtest)
-            add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/gtest)
+            set(BUILD_GTEST ON CACHE BOOL "")
+            set(BUILD_GMOCK OFF CACHE BOOL "")
+            set(gtest_force_shared_crt ON CACHE BOOL "")
+            # option(BUILD_GTEST "Builds the googletest subproject" CACHE ON)
+            # option(BUILD_GMOCK "Builds the googlemock subproject" CACHE OFF)
+            # option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." CACHE ON)
+            add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul/ext/googletest)
         endif ()
 
         set_property(TARGET gtest PROPERTY FOLDER "External")