diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7a3e3b2..6b563fa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ ENDIF(BUILD_DOCUMENTATION)
 
 #-----------------------------------------------------------------------------
 # For openjpeg team if they ever want Dart+CMake
-IF(OPJ_STANDALONE)
+IF(OPENJPEG_STANDALONE)
   INCLUDE(Dart)
   MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
   IF(BUILD_TESTING)
@@ -89,7 +89,7 @@ IF(OPJ_STANDALONE)
     SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard")
     MARK_AS_ADVANCED(BUILDNAME)
   ENDIF(BUILD_TESTING)
-ENDIF(OPJ_STANDALONE)
+ENDIF(OPENJPEG_STANDALONE)
 
 # TODO, technically we should add tests, e.g:
 # http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
diff --git a/ChangeLog b/ChangeLog
index eb500934..0cdd7892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,13 +6,14 @@ What's New for OpenJPEG
 + : added
 
 September 6, 2007
-* [Mathieu Malaterre] CMake: start compiling mj2, jpwl and jp3d
-* [Mathieu Malaterre] CMake: output all executable/libs into one single directory
-* [Mathieu Malaterre] CMake: start compiling index_create
-* [Mathieu Malaterre] OpenJPEG.rc update copyright year
-* [Mathieu Malaterre] CMake: add Java j2kviewer but do not compile it using cmake since cmake has too poor support for Java. Should create a custom command running ant instead.
-* [Mathieu Malaterre] CMake: Add doxygen output
++ [Mathieu Malaterre] CMake: start compiling mj2, jpwl and jp3d
++ [Mathieu Malaterre] CMake: output all executable/libs into one single directory
++ [Mathieu Malaterre] CMake: start compiling index_create
++ [Mathieu Malaterre] OpenJPEG.rc update copyright year
++ [Mathieu Malaterre] CMake: add Java j2kviewer but do not compile it using cmake since cmake has too poor support for Java. Should create a custom command running ant instead.
++ [Mathieu Malaterre] CMake: Add doxygen output
 + [GB] One more field in the codestream_info struct for recording the number of packets per tile part; JPWL now distributes the EPBs in all the tile part headers
++ [Mathieu Malaterre] CMake: Add very simple tests (simply run command line with no option)
 
 September 4, 2007
 + [GB] Added some fields in the codestream_info structure: they are used to record the position of single tile parts. Changed also the write_index function in the codec, to reflect the presence of this new information.
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index 7cb80904..a381840c 100644
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -42,6 +42,7 @@ FIND_PACKAGE(TIFF REQUIRED)
 FOREACH(exe j2k_to_image image_to_j2k)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
   TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES})
+  ADD_TEST(${exe} ${exe})
   # On unix you need to link to the math library:
   IF(UNIX)
     TARGET_LINK_LIBRARIES(${exe} m)