diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt
index 5935f23fe9fe9ad725607b3b1a43f454b161c61b..248583d775cfaf4defd08ee0dba612df714c8c4a 100644
--- a/indra/integration_tests/CMakeLists.txt
+++ b/indra/integration_tests/CMakeLists.txt
@@ -1,4 +1,6 @@
 # -*- cmake -*-
 
 add_subdirectory(llui_libtest)
-add_subdirectory(llimage_libtest)
+if (LLIMAGE_LIBTEST)
+  add_subdirectory(llimage_libtest)
+endif (LLIMAGE_LIBTEST)
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index f59440be6bfc1d437f0705f247f223431f44ec22..cab0546083508ec25bea5dceb31cbc22fea64a38 100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
@@ -53,9 +53,9 @@ if (DARWIN)
   find_library(COREFOUNDATION_LIBRARY CoreFoundation)
   set(OS_LIBRARIES ${COREFOUNDATION_LIBRARY})
 elseif (WINDOWS)
-#  set(OS_LIBRARIES)
+  set(OS_LIBRARIES)
 elseif (LINUX)
-#  set(OS_LIBRARIES)
+  set(OS_LIBRARIES)
 else (DARWIN)
   message(FATAL_ERROR "Unknown platform")
 endif (DARWIN)