diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index cb01ec1781..891fa11a6e 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -62,15 +62,14 @@ add_custom_target(check ALL
     -Dtest_incomplete_11=$<something,,
     -Dtest_incomplete_12=$<,,
     -Dtest_incomplete_13=$<some$<1:special>thing
-    -Dtest_incomplete_14=$<<something
+    -Dtest_incomplete_14=$<$<ANGLE-R>
     -Dtest_incomplete_15=$<some$<thing
-    -Dtest_incomplete_16=$<<some$<thing
+    -Dtest_incomplete_16=$<BOOL:something
     -Dtest_incomplete_17=$<1:some$thing>
     -Dtest_incomplete_18=$<1:some,thing
     -Dtest_incomplete_19=$<1:some,thing$<ANGLE-R>
     -Dtest_incomplete_20=$<CONFIGURATION$<ANGLE-R>
     -Dtest_incomplete_21=$<BOOL:something$<ANGLE-R>
-    -Dtest_incomplete_22=$<BOOL:something
     -P ${CMAKE_CURRENT_SOURCE_DIR}/check.cmake
   COMMAND ${CMAKE_COMMAND} -E echo "check done"
   VERBATIM
diff --git a/Tests/GeneratorExpression/check.cmake b/Tests/GeneratorExpression/check.cmake
index bfdbd65776..8ffa4819e7 100644
--- a/Tests/GeneratorExpression/check.cmake
+++ b/Tests/GeneratorExpression/check.cmake
@@ -63,12 +63,11 @@ check(test_incomplete_10 "$<something:,:")
 check(test_incomplete_11 "$<something,,")
 check(test_incomplete_12 "$<,,")
 check(test_incomplete_13 "$<somespecialthing")
-check(test_incomplete_14 "$<<something")
+check(test_incomplete_14 "$<>")
 check(test_incomplete_15 "$<some$<thing")
-check(test_incomplete_16 "$<<some$<thing")
+check(test_incomplete_16 "$<BOOL:something")
 check(test_incomplete_17 "some$thing")
 check(test_incomplete_18 "$<1:some,thing")
 check(test_incomplete_19 "$<1:some,thing>")
 check(test_incomplete_20 "$<CONFIGURATION>")
 check(test_incomplete_21 "$<BOOL:something>")
-check(test_incomplete_22 "$<BOOL:something")