diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5c36c3087..2d4304ad6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,8 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON)
+
 if (MSVC)
   option(OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION "Raise exceptions when encountering Inf's or Nan's in floating point numbers" OFF)
 
@@ -193,7 +195,6 @@ if (MSVC AND TARGET OpenSpace)
 endif ()
 
 
-option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON)
 if (OPENSPACE_HAVE_TESTS)
   add_subdirectory(support/coding/codegen/tests)
   set_target_properties(run_test_codegen PROPERTIES FOLDER "Unit Tests/support")
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 70696c272f..d486cc0669 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 70696c272f54ad515f78baff4a1a798e52dd13d4
+Subproject commit d486cc066900167d513a045f0554259a07025a3b