diff --git a/generator/generator_tests/CMakeLists.txt b/generator/generator_tests/CMakeLists.txt
index 0dc12ec937..12fba997bd 100644
--- a/generator/generator_tests/CMakeLists.txt
+++ b/generator/generator_tests/CMakeLists.txt
@@ -61,12 +61,4 @@ omim_link_libraries(
   ${LIBZ}
 )
 
-if (PLATFORM_MAC)
-  omim_link_libraries(
-    ${PROJECT_NAME}
-    "-framework Cocoa"
-    "-framework SystemConfiguration"
-  )
-endif()
-
 link_qt5_core(${PROJECT_NAME})
diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt
index 74fcaa16d3..9085909490 100644
--- a/map/CMakeLists.txt
+++ b/map/CMakeLists.txt
@@ -59,6 +59,6 @@ set(
 
 add_library(${PROJECT_NAME} ${SRC})
 
-omim_add_test_subdirectory(mwm_tests)
 omim_add_test_subdirectory(map_tests)
+omim_add_test_subdirectory(mwm_tests)
 omim_add_test_subdirectory(style_tests)
diff --git a/storage/storage_integration_tests/CMakeLists.txt b/storage/storage_integration_tests/CMakeLists.txt
index e581ad41c4..cbabeadde9 100644
--- a/storage/storage_integration_tests/CMakeLists.txt
+++ b/storage/storage_integration_tests/CMakeLists.txt
@@ -54,4 +54,3 @@ omim_link_libraries(
 
 link_opengl(${PROJECT_NAME})
 link_qt5_core(${PROJECT_NAME})
-