diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index 160c3f72ec..d2a1b8d20f 100644
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -37,6 +37,7 @@ set(
   servers_list.hpp
   settings.cpp
   settings.hpp
+  socket.hpp
 )
 
 
@@ -50,6 +51,7 @@ if(${PLATFORM_IPHONE})
     platform_ios.mm
     platform_unix_impl.cpp
     platform_unix_impl.hpp
+    socket_apple.mm
   )
 elseif(${PLATFORM_ANDROID})
   set(
@@ -91,6 +93,7 @@ else() # neither iPhone nor Android
       platform_mac.mm
       platform_unix_impl.cpp
       platform_unix_impl.hpp
+      socket_apple.mm
     )
   elseif(${PLATFORM_LINUX})
     set(
diff --git a/platform/platform_tests_support/CMakeLists.txt b/platform/platform_tests_support/CMakeLists.txt
index 8aca483afd..3b5dbc2791 100644
--- a/platform/platform_tests_support/CMakeLists.txt
+++ b/platform/platform_tests_support/CMakeLists.txt
@@ -6,6 +6,8 @@ set(
   scoped_file.hpp
   scoped_mwm.cpp
   scoped_mwm.hpp
+  test_socket.cpp
+  test_socket.hpp
   writable_dir_changer.cpp
   writable_dir_changer.hpp
 )
diff --git a/tracking/pytracking/CMakeLists.txt b/tracking/pytracking/CMakeLists.txt
index 62f539906b..a26498469b 100644
--- a/tracking/pytracking/CMakeLists.txt
+++ b/tracking/pytracking/CMakeLists.txt
@@ -8,12 +8,15 @@ add_compile_options(
     "-Wno-unused-local-typedef"
 )
 
-set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME ON)
+
+if (PLATFORM_MAC)
+  set(Boost_USE_STATIC_LIBS ON)
+  set(Boost_USE_STATIC_RUNTIME ON)
+endif()
 
 find_package(PythonLibs 2.7 REQUIRED)
-find_package(Boost 1.60 REQUIRED COMPONENTS python)
+find_package(Boost 1.54 REQUIRED COMPONENTS python)
 include_directories(${PYTHON_INCLUDE_DIRS})
 
 add_library(${PROJECT_NAME} MODULE ${SRC})
diff --git a/tracking/tracking_tests/CMakeLists.txt b/tracking/tracking_tests/CMakeLists.txt
index 9bdb8862d6..377c3a7dbb 100644
--- a/tracking/tracking_tests/CMakeLists.txt
+++ b/tracking/tracking_tests/CMakeLists.txt
@@ -5,4 +5,12 @@ set(
 )
 
 omim_add_test(tracking_tests ${SRC})
-omim_link_libraries(tracking_tests tracking)
+omim_link_libraries(tracking_tests tracking platform platform_tests_support coding base geometry tomcrypt ${Qt5Widgets_LIBRARIES})
+
+if (${PLATFORM_MAC})
+  target_link_libraries(tracking_tests
+    "-framework Cocoa"
+    "-framework IOKit"
+    "-framework SystemConfiguration"
+  )
+endif()