diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index a791b89dc..b20c7a989 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -220,7 +220,7 @@ class cmPolicy;
     3, 3, 0, cmPolicies::WARN) \
   SELECT(POLICY, CMP0064, \
     "Support new TEST if() operator.", \
-    3, 3, 0, cmPolicies::WARN)
+    3, 4, 0, cmPolicies::WARN)
 
 #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
 #define CM_FOR_EACH_POLICY_ID(POLICY) \
diff --git a/Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt b/Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt
new file mode 100644
index 000000000..71f1ab772
--- /dev/null
+++ b/Tests/RunCMake/CMP0064/CMP0064-WARN-stderr.txt
@@ -0,0 +1,10 @@
+CMake Warning \(dev\) at CMP0064-WARN.cmake:3 \(if\):
+  Policy CMP0064 is not set: Support new TEST if\(\) operator.  Run "cmake
+  --help-policy CMP0064" for policy details.  Use the cmake_policy command to
+  set the policy and suppress this warning.
+
+  TEST will be interpreted as an operator when the policy is set to NEW.
+  Since the policy is not set the OLD behavior will be used.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
+This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake b/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
index bffd3f362..8f26ec62b 100644
--- a/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
+++ b/Tests/RunCMake/CMP0064/CMP0064-WARN.cmake
@@ -1,4 +1,4 @@
-cmake_policy(SET CMP0064 OLD)
+
 
 if(TEST)
   message(FATAL_ERROR "TEST was not recognized to be undefined")