diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fecf1af911e10c4707ad76986a6f8b1b6a34417..5b37a885c4b43ee50a0929100a2b2086ad061694 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,15 +381,7 @@ install(
 # Test data download
 #--------------------------------------------------------------------------
 include(imstkExternalDataDownloadTest)
-
-#--------------------------------------------------------------------------
-# Append external data needed for testing to be downloaded later
-#--------------------------------------------------------------------------
-list(APPEND FILE_LIST
-    asianDragon/,REGEX:.*
-    human/,REGEX:.*
-    oneTet/,REGEX:.*)
-    
+ 
 #--------------------------------------------------------------------------
 # Add Examples subdirectories
 #--------------------------------------------------------------------------
@@ -400,7 +392,9 @@ endif()
 #-----------------------------------------------------------------------------
 # Download the external data needed for both testing and examples
 #-----------------------------------------------------------------------------
-imstk_add_data(${PROJECT_NAME} ${FILE_LIST})
+if(BUILD_TESTING OR BUILD_EXAMPLES)
+    imstk_add_data(${PROJECT_NAME} ${FILE_LIST})
+endif()
 
 #--------------------------------------------------------------------------
 # Innerbuild dummy test
diff --git a/Source/Collision/CMakeLists.txt b/Source/Collision/CMakeLists.txt
index fc1b62b91d0daf61187ea0410e6c07a6ac2f7776..552254c998ca374e9671fcd7aabdd621ce2a97de 100644
--- a/Source/Collision/CMakeLists.txt
+++ b/Source/Collision/CMakeLists.txt
@@ -15,6 +15,14 @@ imstk_add_library( Collision
 # Testing
 #-----------------------------------------------------------------------------
 if( BUILD_TESTING )
-  include(imstkAddTest)
-  imstk_add_test( Collision )
+        
+    include(imstkAddTest)
+
+    list(APPEND FILE_LIST_COL_TEST
+        asianDragon/,REGEX:.*
+        human/,REGEX:.*
+        oneTet/,REGEX:.*)
+    
+    imstk_add_test(Collision)
+    imstk_add_data(Collision ${FILE_LIST_COL_TEST})
 endif()