diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake
index 3fee15d8b9..308980c59c 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-NOWARN-static-NEW)
+enable_language(CXX)
 
 cmake_policy(SET CMP0022 NEW)
 
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
index 3e4144fcd5..17f71b0326 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-NOWARN-static)
+enable_language(CXX)
 
 add_library(foo STATIC empty_vs6_1.cpp)
 add_library(bar STATIC empty_vs6_2.cpp)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake
index c5d3c29d9f..7356e29d34 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-empty-old.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-WARN-empty-old)
+enable_language(CXX)
 
 add_library(foo SHARED empty_vs6_1.cpp)
 add_library(bar SHARED empty_vs6_2.cpp)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake
index b3cb13160a..0ea4fe5a50 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-static.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-WARN)
+enable_language(CXX)
 
 add_library(foo STATIC empty_vs6_1.cpp)
 add_library(bar STATIC empty_vs6_2.cpp)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake
index 03223e86a1..ba207db78a 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-WARN-tll)
+enable_language(CXX)
 
 add_library(foo SHARED empty_vs6_1.cpp)
 add_library(bar SHARED empty_vs6_2.cpp)
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake b/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake
index e3552b2f04..38adccaef5 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-WARN)
+enable_language(CXX)
 
 cmake_policy(SET CMP0042 NEW)
 
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export.cmake b/Tests/RunCMake/CMP0022/CMP0022-export.cmake
index 06147f39ee..e121b53626 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-export.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-export.cmake
@@ -1,5 +1,5 @@
 
-project(cmp0022NEW)
+enable_language(CXX)
 
 cmake_policy(SET CMP0022 NEW)
 
diff --git a/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake b/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake
index 171febe3a6..532e204b8f 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake
+++ b/Tests/RunCMake/CMP0022/CMP0022-install-export.cmake
@@ -1,5 +1,5 @@
 
-project(cmp0022NEW)
+enable_language(CXX)
 
 cmake_policy(SET CMP0022 NEW)
 
diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake
index f8b354690c..f87a684991 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake
+++ b/Tests/RunCMake/target_link_libraries/CMP0023-NEW-2.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-WARN)
+enable_language(CXX)
 
 cmake_policy(SET CMP0023 NEW)
 
diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake
index f0aa63fbd4..211029bf93 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake
+++ b/Tests/RunCMake/target_link_libraries/CMP0023-NEW.cmake
@@ -1,5 +1,5 @@
 
-project(CMP0022-WARN)
+enable_language(CXX)
 
 cmake_policy(SET CMP0023 NEW)
 
diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake
index a5bf2fbb55..a175a6118c 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake
+++ b/Tests/RunCMake/target_link_libraries/CMP0023-WARN-2.cmake
@@ -1,5 +1,5 @@
 cmake_policy(VERSION 2.8.11)
-project(CMP0022-WARN)
+enable_language(CXX)
 
 add_library(foo SHARED empty_vs6_1.cpp)
 add_library(bar SHARED empty_vs6_2.cpp)
diff --git a/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake b/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake
index d6f34a1d8d..7fbb70e3bb 100644
--- a/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake
+++ b/Tests/RunCMake/target_link_libraries/CMP0023-WARN.cmake
@@ -1,5 +1,5 @@
 cmake_policy(VERSION 2.8.11)
-project(CMP0022-WARN)
+enable_language(CXX)
 
 add_library(foo SHARED empty_vs6_1.cpp)
 add_library(bar SHARED empty_vs6_2.cpp)