diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 3e4181b8d3..337aeb1cf6 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8)
 
 project(CompileDefinitions)
 
+if ("${CMAKE_GENERATOR}" STREQUAL "Visual Studio 6")
+    add_definitions(-DNO_SPACES_IN_DEFINE_VALUES)
+endif()
+
 add_subdirectory(add_definitions_command)
 add_subdirectory(target_prop)
 add_subdirectory(add_definitions_command_with_target_prop)
diff --git a/Tests/CompileDefinitions/main.cpp b/Tests/CompileDefinitions/main.cpp
index d80c9dc9a6..6db6f3f96b 100644
--- a/Tests/CompileDefinitions/main.cpp
+++ b/Tests/CompileDefinitions/main.cpp
@@ -15,11 +15,16 @@ template<>
 struct CMakeStaticAssert<true> {};
 
 static const char fun_string[] = CMAKE_IS_;
+#ifndef NO_SPACES_IN_DEFINE_VALUES
 static const char very_fun_string[] = CMAKE_IS_REALLY;
+#endif
 
 enum {
-  StringLiteralTest1 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_) == sizeof("Fun")>),
+  StringLiteralTest1 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_) == sizeof("Fun")>)
+#ifndef NO_SPACES_IN_DEFINE_VALUES
+  ,
   StringLiteralTest2 = sizeof(CMakeStaticAssert<sizeof(CMAKE_IS_REALLY) == sizeof("Very Fun")>)
+#endif
 };
 
 int main(int argc, char **argv)