diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt
new file mode 100644
index 0000000000..75d5a7ef65
--- /dev/null
+++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar-stderr.txt
@@ -0,0 +1,4 @@
+^CMAKE_POLICY_VERSION_MINIMUM='3\.10'
+CMAKE_MINIMUM_REQUIRED_VERSION='3\.1'
+CMP0071='NEW'
+CMP0072=''$
diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake
similarity index 76%
rename from Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake
rename to Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake
index 553fc94d14..c8975ddfcd 100644
--- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable.cmake
+++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVar.cmake
@@ -1,4 +1,4 @@
-set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
+message("CMAKE_POLICY_VERSION_MINIMUM='${CMAKE_POLICY_VERSION_MINIMUM}'")
 cmake_minimum_required(VERSION 3.1...3.4)
 message("CMAKE_MINIMUM_REQUIRED_VERSION='${CMAKE_MINIMUM_REQUIRED_VERSION}'")
 foreach(policy CMP0071 CMP0072)
diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-result.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-result.txt
similarity index 100%
rename from Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-result.txt
rename to Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-result.txt
diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt
new file mode 100644
index 0000000000..ff6997d297
--- /dev/null
+++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad-stderr.txt
@@ -0,0 +1,9 @@
+^CMake Error at CMakeLists\.txt:1 \(cmake_minimum_required\):
+  Invalid CMAKE_POLICY_VERSION_MINIMUM value "\.\.\.3\.10"\.  A numeric
+  major\.minor\[\.patch\[\.tweak\]\] must be given\.
++
+CMake Error at PolicyVersionVarBad\.cmake:1 \(cmake_minimum_required\):
+  Invalid CMAKE_POLICY_VERSION_MINIMUM value "\.\.\.3\.10"\.  A numeric
+  major\.minor\[\.patch\[\.tweak\]\] must be given\.
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake
similarity index 50%
rename from Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake
rename to Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake
index 763997b40f..c602a4aeba 100644
--- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad.cmake
+++ b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVarBad.cmake
@@ -1,2 +1 @@
-set(CMAKE_POLICY_VERSION_MINIMUM ...3.10)
 cmake_minimum_required(VERSION 3.1...3.4)
diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt
deleted file mode 100644
index 4f161bf084..0000000000
--- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariable-stderr.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-^CMAKE_MINIMUM_REQUIRED_VERSION='3\.1'
-CMP0071='NEW'
-CMP0072=''$
diff --git a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt b/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt
deleted file mode 100644
index 3a59bb77a6..0000000000
--- a/Tests/RunCMake/cmake_minimum_required/PolicyVersionVariableBad-stderr.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-^CMake Error at PolicyVersionVariableBad\.cmake:2 \(cmake_minimum_required\):
-  Invalid CMAKE_POLICY_VERSION_MINIMUM value "\.\.\.3\.10"\.  A numeric
-  major\.minor\[\.patch\[\.tweak\]\] must be given\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake b/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake
index d91f171546..0d2d0f615a 100644
--- a/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake
+++ b/Tests/RunCMake/cmake_minimum_required/RunCMakeTest.cmake
@@ -7,5 +7,5 @@ run_cmake(BeforeVersionDeprecated)
 run_cmake(Range)
 run_cmake(RangeBad)
 run_cmake(Unknown)
-run_cmake(PolicyVersionVariable)
-run_cmake(PolicyVersionVariableBad)
+run_cmake_with_options(PolicyVersionVar -DCMAKE_POLICY_VERSION_MINIMUM=3.10)
+run_cmake_with_options(PolicyVersionVarBad -DCMAKE_POLICY_VERSION_MINIMUM=...3.10)