diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 921c968286..faf12ad20f 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -1186,6 +1186,7 @@ bool RiaApplication::parseArguments()
 //--------------------------------------------------------------------------------------------------
 int RiaApplication::launchUnitTests()
 {
+#ifdef USE_UNIT_TESTS
     cvf::Assert::setReportMode(cvf::Assert::CONSOLE);
 
     int argc = QCoreApplication::argc();
@@ -1198,6 +1199,9 @@ int RiaApplication::launchUnitTests()
     // parsed by InitGoogleTest().
 
     return RUN_ALL_TESTS();
+#else
+    return -1;
+#endif
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt
index aabac1605d..218ce46306 100644
--- a/ApplicationCode/CMakeLists.txt
+++ b/ApplicationCode/CMakeLists.txt
@@ -61,8 +61,6 @@ set( APPLICATION_FILES
     Application/RiaImageCompareReporter.cpp
     Application/RiaProjectModifier.cpp
     Application/RiaRegressionTest.cpp
-    
-    ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc	
 )
 
 set( USER_INTERFACE_FILES
@@ -112,11 +110,6 @@ set( SOCKET_INTERFACE_FILES
     SocketInterface/RiaSocketDataTransfer.cpp
 )
 
-# Using GLOB here to ease adding of new unit tests
-FILE ( GLOB UNIT_TEST_FILES
-    UnitTests/*.cpp 
-)
-
 list( APPEND CPP_SOURCES
      ${APPLICATION_FILES}
      ${USER_INTERFACE_FILES}
@@ -144,6 +137,21 @@ list( APPEND REFERENCED_CMAKE_FILES
     Commands/CrossSectionCommands/CMakeLists_files.cmake
 )
 
+option (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS "Include ApplicationCode Unit Tests" OFF)
+if (RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS)
+	add_definitions(-DUSE_UNIT_TESTS)
+
+    list( APPEND REFERENCED_CMAKE_FILES
+        UnitTests/CMakeLists_files.cmake
+        )
+    
+    list( APPEND CPP_SOURCES 
+        ${ResInsight_SOURCE_DIR}/ThirdParty/gtest/gtest-all.cc	
+        )
+    
+endif()
+
+
 # Include source file lists from *.cmake files
 foreach (referencedfile ${REFERENCED_CMAKE_FILES})
     include (${referencedfile})
diff --git a/ApplicationCode/UnitTests/CMakeLists_files.cmake b/ApplicationCode/UnitTests/CMakeLists_files.cmake
new file mode 100644
index 0000000000..26efe91b33
--- /dev/null
+++ b/ApplicationCode/UnitTests/CMakeLists_files.cmake
@@ -0,0 +1,33 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+set (SOURCE_GROUP_HEADER_FILES
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}cvfGeometryTools-Test.cpp
+${CEE_CURRENT_LIST_DIR}Ert-Test.cpp
+${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools-Test.cpp
+${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput-Test.cpp
+${CEE_CURRENT_LIST_DIR}RigActiveCellInfo-Test.cpp
+${CEE_CURRENT_LIST_DIR}RigReservoir-Test.cpp
+${CEE_CURRENT_LIST_DIR}RigStatisticsMath-Test.cpp
+${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurveImpl-Test.cpp
+${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator-Test.cpp
+${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapper-Test.cpp
+${CEE_CURRENT_LIST_DIR}ScalarMapper-Test.cpp
+${CEE_CURRENT_LIST_DIR}WellPathAsciiFileReader-Test.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "UnitTests" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )