diff --git a/Tests/CommandLineTest/CMakeLists.txt b/Tests/CommandLineTest/CMakeLists.txt
index d24ea948c..08fe8d3fa 100644
--- a/Tests/CommandLineTest/CMakeLists.txt
+++ b/Tests/CommandLineTest/CMakeLists.txt
@@ -73,9 +73,16 @@ ELSE(THIS_SHOULD_BE_SET)
   MESSAGE(FATAL_ERROR "PreLoad.cmake does not work.")
 ENDIF(THIS_SHOULD_BE_SET)
 
+IF(DEFINED ENV{TEST_ENVIRONMENT_VARIABLE_NOTSET})
+  MESSAGE(SEND_ERROR "Environment variable definition test broken!")
+ENDIF(DEFINED ENV{TEST_ENVIRONMENT_VARIABLE_NOTSET})
+
 SET(ENV{TEST_ENVIRONMENT_VARIABLE} "Environment variable set")
 IF("$ENV{TEST_ENVIRONMENT_VARIABLE}" STREQUAL "Environment variable set")
   MESSAGE(STATUS "Environment variable set to: $ENV{TEST_ENVIRONMENT_VARIABLE}")
+  IF(NOT DEFINED ENV{TEST_ENVIRONMENT_VARIABLE})
+    MESSAGE(SEND_ERROR "Environment variable definition test failed!")
+  ENDIF(NOT DEFINED ENV{TEST_ENVIRONMENT_VARIABLE})
 ELSE("$ENV{TEST_ENVIRONMENT_VARIABLE}" STREQUAL "Environment variable set")
   MESSAGE(SEND_ERROR "Environment variable setting is broken")
 ENDIF("$ENV{TEST_ENVIRONMENT_VARIABLE}" STREQUAL "Environment variable set")