diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94a0923f46..7f674734fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,6 @@ add_subdirectory(editor)
 add_subdirectory(indexer)
 add_subdirectory(routing)
 add_subdirectory(search)
-add_subdirectory(traffic)
 add_subdirectory(tracking)
 add_subdirectory(traffic)
 add_subdirectory(partners_api)
\ No newline at end of file
diff --git a/partners_api/partners_api_tests/CMakeLists.txt b/partners_api/partners_api_tests/CMakeLists.txt
index d0dbb0cda0..c4348aae20 100644
--- a/partners_api/partners_api_tests/CMakeLists.txt
+++ b/partners_api/partners_api_tests/CMakeLists.txt
@@ -16,7 +16,6 @@ omim_link_libraries(
   platform
   coding
   base
-  tomcrypt
   jansson
   stats_client
   ${LIBZ}
diff --git a/traffic/CMakeLists.txt b/traffic/CMakeLists.txt
index c77f3f67ee..67e22055b3 100644
--- a/traffic/CMakeLists.txt
+++ b/traffic/CMakeLists.txt
@@ -11,4 +11,4 @@ set(
 add_library(${PROJECT_NAME} ${SRC})
 
 add_subdirectory(pytraffic)
-#add_subdirectory(traffic_tests)
+add_subdirectory(traffic_tests)
diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt
index 95aa28894d..148e08ec52 100644
--- a/traffic/pytraffic/CMakeLists.txt
+++ b/traffic/pytraffic/CMakeLists.txt
@@ -44,5 +44,14 @@ if (PLATFORM_WIN OR PLATFORM_LINUX)
   )
 endif()
 
-omim_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} traffic platform geometry base)
+omim_link_libraries(
+  ${PROJECT_NAME}
+  ${PYTHON_LIBRARIES}
+  ${Boost_LIBRARIES}
+  traffic
+  platform
+  geometry
+  base
+)
+
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
diff --git a/traffic/traffic_tests/CMakeLists.txt b/traffic/traffic_tests/CMakeLists.txt
index d148cf6e5d..d722122235 100644
--- a/traffic/traffic_tests/CMakeLists.txt
+++ b/traffic/traffic_tests/CMakeLists.txt
@@ -22,8 +22,8 @@ omim_link_libraries(
   geometry
   base
   stats_client
-  tomcrypt
   ${Qt5Core_LIBRARIES}
+  ${LIBZ}
 )
 
 if (PLATFORM_MAC)