diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7da867003..db446e860 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required (VERSION 2.8)
 set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
-if(POLICY CMP0037)
-  cmake_policy(SET CMP0037 OLD)
-endif()
 
 include (CheckFunctionExists)
 include (CheckStructHasMember)
diff --git a/ChangeLog b/ChangeLog
index 930662cfe..83fe44e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@
 - TW-1527 Extra spaces added around slashes (thanks to Renato Alves).
 - TW-1529 Parser incorrectly inserting spaces into task description (thanks to
           David Brenner).
+- TW-1543 cmake complains "test" is not a valid target (on arch linux) (thanks
+          to Renato Alves).
 - TW-1569 update wait:<wait-date> manpage entry (thanks to David Patrick).
 - TW-1572 Better urgency inheritance (thanks to Jens Erat).
 - TW-1575 `task log` mangles URLs when quoted (thanks to Luke Macken).
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ee54e1bf..40f8a3e1a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,7 @@
 cmake_minimum_required (VERSION 2.8)
+if(POLICY CMP0037)
+  cmake_policy(SET CMP0037 OLD)
+endif()
 include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/src
                      ${CMAKE_SOURCE_DIR}/src/commands