diff --git a/CMakeLists.txt b/CMakeLists.txt
index afea28afb603659980b2aceca63295cb0469b0d6..c987943895d08c474e6a66b6ee737c9279299bb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.10)
 project(usgscsm VERSION 0.0.1 DESCRIPTION "usgscsm library")
-
+  
+include(GoogleTest)
 include(cmake/gtest.cmake)
 include(GNUInstallDirs)
-include(GoogleTest)
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -44,12 +44,8 @@ target_include_directories(usgscsm
                            ${CSM_INCLUDE_DIR}
 )
 
-# Setup for GoogleTest
-find_package (Threads)
-
 target_link_libraries(usgscsm
-                      ${CSM_LIBRARY}
-                      gtest ${CMAKE_THREAD_LIBS_INIT})
+                      ${CSM_LIBRARY})
 
 if(WIN32)
   install(TARGETS usgscsm RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -62,6 +58,12 @@ install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR
 # Optional build or link against CSM
 option (BUILD_TESTS "Build tests" ON)
 if(BUILD_TESTS)
+  
+  # Setup for GoogleTest
+  find_package (Threads)
+
+  target_link_libraries(usgscsm
+                        gtest ${CMAKE_THREAD_LIBS_INIT})
   include(CTest)
   enable_testing()
   add_subdirectory(tests)