diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1252948b..cf8e86a3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,27 +1,37 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg
-                    ${OPENJPEG_SOURCE_DIR}/applications/codec
-                    ${OPENJPEG_SOURCE_DIR}/applications/common
-                    ${Z_INCLUDE_DIRNAME}
-                    ${PNG_INCLUDE_DIRNAME}
-                    ${TIFF_INCLUDE_DIRNAME}
-                    )
+# Tests
+INCLUDE_DIRECTORIES(
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${OPENJPEG_SOURCE_DIR}/applications/codec
+  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${Z_INCLUDE_DIRNAME}
+  ${PNG_INCLUDE_DIRNAME}
+  ${TIFF_INCLUDE_DIRNAME}
+  )
 
 # First thing define the common source:
-SET(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+SET(comparePGXimages_SRCS comparePGXimages.c
+  ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
+  )
 
-SET(compare_dump_files_SRCS compare_dump_files.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+SET(compare_dump_files_SRCS compare_dump_files.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
 
-SET(compareRAWimages_SRCS compareRAWimages.c ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
+SET(compareRAWimages_SRCS compareRAWimages.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
 
 ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS})
-TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME}
-                                       ${Z_LIBNAME}
-                                       ${PNG_LIBNAME}
-                                       ${TIFF_LIBNAME}
-                                       )
-                                       
+TARGET_LINK_LIBRARIES(comparePGXimages
+  ${OPENJPEG_LIBRARY_NAME}
+  ${PNG_LIBNAME} ${TIFF_LIBNAME}
+  )
+# To support universal exe:
+IF(ZLIB_FOUND AND APPLE)
+  TARGET_LINK_LIBRARIES(comparePGXimages z)
+ELSe(ZLIB_FOUND AND APPLE)
+  TARGET_LINK_LIBRARIES(comparePGXimages ${Z_LIBNAME})
+ENDIF(ZLIB_FOUND AND APPLE)
+
 ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS})
 
 ADD_EXECUTABLE(j2k_random_tile_access j2k_random_tile_access.c)
@@ -36,3 +46,14 @@ ENDIF(NOT HAVE_LIBPNG)
 
 ADD_SUBDIRECTORY(conformance)
 ADD_SUBDIRECTORY(nonregression)
+
+IF(BUILD_JPIP)
+  IF(JPIP_SERVER)
+    #SET(s "http://jpip.example.com/myFCGI?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream")
+    SET(s "${JPIP_SERVER}?target=16.jp2&fsiz=170,170&cnew=http&type=jpp-stream")
+    SET(p "${CMAKE_CURRENT_BINARY_DIR}/jpip.dat")
+    SET(md5 "62b00c620fb0a600c5ffd413cada4674")
+    ADD_TEST(TestJPIP1 ${CMAKE_COMMAND} -DD_URL:STRING=${s} -DD_FILE:PATH=${p}
+      -DEXPECTED_MD5=${md5} -P ${PROJECT_SOURCE_DIR}/CMake/JPIPTestDriver.cmake)
+  ENDIF(JPIP_SERVER)
+ENDIF(BUILD_JPIP)