diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8603275b..ac44fa67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,6 +155,9 @@ IF(BUILD_TESTING)
 ENDIF(BUILD_TESTING)
 
 IF(BUILD_TESTING)
+SET(CMAKE_MODULE_PATH "${OPENJPEG_SOURCE_DIR}/CMake")
+FIND_PACKAGE(FreeImage REQUIRED)
+
   SUBDIRS(
     test_V2_tile_handling
     test_Free_image_V2_tile_handling
diff --git a/test_Free_image_V2_tile_handling/CMakeLists.txt b/test_Free_image_V2_tile_handling/CMakeLists.txt
index f75ea8cd..277e3e3b 100644
--- a/test_Free_image_V2_tile_handling/CMakeLists.txt
+++ b/test_Free_image_V2_tile_handling/CMakeLists.txt
@@ -16,7 +16,8 @@ IF(NOT BUILD_SHARED_LIBS)
   ADD_DEFINITIONS(-DOPJ_STATIC)
 ENDIF(NOT BUILD_SHARED_LIBS)
 
-INCLUDE(${OPENJPEG_SOURCE_DIR}/CMake/Free_CMakeImport.cmake)
+#INCLUDE(${OPENJPEG_SOURCE_DIR}/CMake/Free_CMakeImport.cmake)
+ADD_DEFINITIONS ( -DFREEIMAGE_LIB )
 
 # Loop over all executables:
 FOREACH(exe test2_encoder test2_decoder)