diff -r b0689af42a71 indra/cmake/LLAddBuildTest.cmake
--- a/indra/cmake/LLAddBuildTest.cmake	Wed Dec 15 22:44:21 2010 +0100
+++ b/indra/cmake/LLAddBuildTest.cmake	Sun Dec 19 16:06:01 2010 +0100
@@ -205,6 +205,9 @@
   endif(TEST_DEBUG)
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
   SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
+  if(STANDALONE)
+    SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}")
+  endif(STANDALONE)
 
   # Add link deps to the executable
   if(TEST_DEBUG)
diff -r b0689af42a71 indra/cmake/Tut.cmake
--- a/indra/cmake/Tut.cmake	Wed Dec 15 22:44:21 2010 +0100
+++ b/indra/cmake/Tut.cmake	Sun Dec 19 16:06:01 2010 +0100
@@ -6,7 +6,6 @@
 
 if (STANDALONE)
   include(FindTut)
-  include_directories(${TUT_INCLUDE_DIR})
 else (STANDALONE)
   use_prebuilt_binary(tut)
 endif (STANDALONE)
diff -r b0689af42a71 indra/test/CMakeLists.txt
--- a/indra/test/CMakeLists.txt	Wed Dec 15 22:44:21 2010 +0100
+++ b/indra/test/CMakeLists.txt	Sun Dec 19 16:06:01 2010 +0100
@@ -27,6 +27,7 @@
     ${LLXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
     ${GOOGLEMOCK_INCLUDE_DIRS}
+    ${TUT_INCLUDE_DIR}
     )
 
 set(test_SOURCE_FILES