diff --git a/Makefile.am b/Makefile.am
index 87034bdf..68766629 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -391,8 +391,6 @@ test_apps = \
 	tests/test_xpub_manual \
 	tests/test_xpub_welcome_msg \
 	tests/test_atomics \
-	tests/test_client_server \
-	tests/test_thread_safe \
 	tests/test_sockopt_hwm \
 	tests/test_heartbeats \
 	tests/test_stream_exceeds_buffer \
@@ -588,12 +586,6 @@ tests_test_xpub_welcome_msg_LDADD = src/libzmq.la
 tests_test_atomics_SOURCES = tests/test_atomics.cpp
 tests_test_atomics_LDADD = src/libzmq.la
 
-tests_test_client_server_SOURCES = tests/test_client_server.cpp
-tests_test_client_server_LDADD = src/libzmq.la
-
-tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
-tests_test_thread_safe_LDADD = src/libzmq.la
-
 tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
 tests_test_sockopt_hwm_LDADD = src/libzmq.la
 
@@ -741,7 +733,14 @@ test_reqrep_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
 endif
 
 if ENABLE_DRAFTS
-test_apps +=
+test_apps += tests/test_client_server \
+	tests/test_thread_safe
+
+tests_test_client_server_SOURCES = tests/test_client_server.cpp
+tests_test_client_server_LDADD = src/libzmq.la
+
+tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
+tests_test_thread_safe_LDADD = src/libzmq.la
 endif
 
 check_PROGRAMS = ${test_apps}
diff --git a/include/zmq.h b/include/zmq.h
index df7dc826..6ce4f1c1 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -260,8 +260,6 @@ ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
 #define ZMQ_XPUB 9
 #define ZMQ_XSUB 10
 #define ZMQ_STREAM 11
-#define ZMQ_SERVER 12
-#define ZMQ_CLIENT 13
 #define ZMQ_RADIO 14
 #define ZMQ_DISH 15
 #define ZMQ_GATHER 16
@@ -582,6 +580,10 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 
 #ifdef ZMQ_BUILD_DRAFT_API
 
+/*  DRAFT Socket types.                                                       */
+#define ZMQ_SERVER 12
+#define ZMQ_CLIENT 13
+
 #endif // ZMQ_BUILD_DRAFT_API
 
 
diff --git a/src/precompiled.hpp b/src/precompiled.hpp
index c6281cd7..282d8ab8 100644
--- a/src/precompiled.hpp
+++ b/src/precompiled.hpp
@@ -152,6 +152,10 @@
 
 #ifndef ZMQ_BUILD_DRAFT_API
 
+/*  DRAFT Socket types.                                                       */
+#define ZMQ_SERVER 12
+#define ZMQ_CLIENT 13
+
 #endif // ZMQ_BUILD_DRAFT_API
 
 #endif //ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 87afa06b..84a5773f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -52,8 +52,6 @@ set(tests
         test_connect_rid
         test_xpub_nodrop
         test_pub_invert_matching
-        test_thread_safe
-        test_client_server
         test_setsockopt
         test_sockopt_hwm
         test_heartbeats
@@ -120,6 +118,8 @@ endif()
 
 IF (ENABLE_DRAFTS)
     list(APPEND tests
+        test_thread_safe
+        test_client_server
     )
 ENDIF (ENABLE_DRAFTS)