diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06bc9702..3fd2889a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -678,85 +678,9 @@ endif()
 set(ZMQ_BUILD_TESTS ON CACHE BOOL "Build the tests for ZeroMQ")
 
 if(ZMQ_BUILD_TESTS)
-  enable_testing()
-  set(tests
-          test_system
-          test_pair_inproc
-          test_pair_tcp
-          test_reqrep_inproc
-          test_reqrep_tcp
-          test_hwm
-          test_reqrep_device
-          test_sub_forward
-          test_invalid_rep
-          test_msg_flags
-          test_connect_resolve
-          test_immediate
-          test_last_endpoint
-          test_term_endpoint
-          test_router_mandatory
-          test_probe_router
-          test_stream
-          test_stream_empty
-          test_stream_disconnect
-          test_disconnect_inproc
-          test_ctx_options
-          test_ctx_destroy
-          test_security_null
-          test_security_plain
-          test_security_curve
-          test_iov
-          test_spec_req
-          test_spec_rep
-          test_spec_dealer
-          test_spec_router
-          test_spec_pushpull
-          test_req_correlate
-          test_req_relaxed
-          test_conflate
-          test_inproc_connect
-          test_issue_566
-          test_shutdown_stress
-          test_timeo
-          test_many_sockets
-          test_diffserv
-          test_connect_rid
-  )
-  if(NOT WIN32)
-    list(APPEND tests
-            test_monitor
-            test_pair_ipc
-            test_reqrep_ipc
-            test_abstract_ipc
-            test_proxy
-            test_filter_ipc
-    )
-    if(HAVE_FORK)
-      list(APPEND tests test_fork)
-    endif()
-  endif()
-
-  foreach(test ${tests})
-    add_executable(${test} tests/${test}.cpp)
-    target_link_libraries(${test} libzmq)
-
-    if(RT_LIBRARY)
-      target_link_libraries(${test} ${RT_LIBRARY} )
-    endif()
-    if(WIN32)
-      add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test})
-    else()
-      add_test(NAME ${test} COMMAND ${test})
-    endif()
-  endforeach()
-
-  if(NOT WIN32)
-    if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
-      set_tests_properties(test_abstract_ipc PROPERTIES WILL_FAIL true)
-    endif()
-  endif()
-
-endif() # ZMQ_BUILD_TESTS
+  enable_testing() # Enable testing only works in root scope
+  ADD_SUBDIRECTORY(tests)
+endif()
 
 #-----------------------------------------------------------------------------
 # installer
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 00000000..17385167
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,79 @@
+# CMake build script for ZeroMQ tests
+
+set(tests
+        test_system
+        test_pair_inproc
+        test_pair_tcp
+        test_reqrep_inproc
+        test_reqrep_tcp
+        test_hwm
+        test_reqrep_device
+        test_sub_forward
+        test_invalid_rep
+        test_msg_flags
+        test_connect_resolve
+        test_immediate
+        test_last_endpoint
+        test_term_endpoint
+        test_router_mandatory
+        test_probe_router
+        test_stream
+        test_stream_empty
+        test_stream_disconnect
+        test_disconnect_inproc
+        test_ctx_options
+        test_ctx_destroy
+        test_security_null
+        test_security_plain
+        test_security_curve
+        test_iov
+        test_spec_req
+        test_spec_rep
+        test_spec_dealer
+        test_spec_router
+        test_spec_pushpull
+        test_req_correlate
+        test_req_relaxed
+        test_conflate
+        test_inproc_connect
+        test_issue_566
+        test_shutdown_stress
+        test_timeo
+        test_many_sockets
+        test_diffserv
+        test_connect_rid
+)
+if(NOT WIN32)
+  list(APPEND tests
+          test_monitor
+          test_pair_ipc
+          test_reqrep_ipc
+          test_abstract_ipc
+          test_proxy
+          test_filter_ipc
+  )
+  if(HAVE_FORK)
+    list(APPEND tests test_fork)
+  endif()
+endif()
+
+foreach(test ${tests})
+  add_executable(${test} ${test}.cpp)
+  target_link_libraries(${test} libzmq)
+
+  if(RT_LIBRARY)
+    target_link_libraries(${test} ${RT_LIBRARY} )
+  endif()
+  if(WIN32)
+    add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test})
+  else()
+    add_test(NAME ${test} COMMAND ${test})
+  endif()
+endforeach()
+
+if(NOT WIN32)
+  if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set_tests_properties(test_abstract_ipc PROPERTIES WILL_FAIL true)
+  endif()
+endif()
+