diff --git a/CMake/JPIPTestDriver.cmake b/CMake/JPIPTestDriver.cmake
new file mode 100644
index 00000000..2147c464
--- /dev/null
+++ b/CMake/JPIPTestDriver.cmake
@@ -0,0 +1,9 @@
+# JPIP test driver
+#message(STATUS "${D_URL}")
+file(DOWNLOAD
+  "${D_URL}"
+  "${D_FILE}"
+  LOG log
+  EXPECTED_MD5 "${EXPECTED_MD5}"
+  )
+message(STATUS "LOG: ${log}")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9bf82c0c..9df4a596 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -43,3 +43,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)