diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index b9c138ed74..5ef94aa5be 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/generator/generator_tests/generator_tests.pro
@@ -23,17 +23,17 @@ HEADERS += \
 
 SOURCES += \
     ../../testing/testingmain.cpp \
-#    check_mwms.cpp \
-#    classificator_tests.cpp \
-#    coasts_test.cpp \
-#    feature_builder_test.cpp \
-#    feature_merger_test.cpp \
-#    metadata_test.cpp \
-#    osm_id_test.cpp \
+    check_mwms.cpp \
+    classificator_tests.cpp \
+    coasts_test.cpp \
+    feature_builder_test.cpp \
+    feature_merger_test.cpp \
+    metadata_test.cpp \
+    osm_id_test.cpp \
     osm_o5m_source_test.cpp \
-#    osm_parser_test.cpp \
-#    osm_type_test.cpp \
-#    tesselator_test.cpp \
-#    triangles_tree_coding_test.cpp \
+    osm_parser_test.cpp \
+    osm_type_test.cpp \
+    tesselator_test.cpp \
+    triangles_tree_coding_test.cpp \
     source_to_element_test.cpp \
     source_data.cpp \
diff --git a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
index 74aacef3a4..b76b8f64cc 100644
--- a/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
+++ b/xcode/generator_tool/generator_tool.xcodeproj/project.pbxproj
@@ -44,6 +44,17 @@
 		675344431A3F65E800A0A8C3 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 675343E01A3F600D00A0A8C3 /* IOKit.framework */; };
 		67AB92C21B73C27300AB5194 /* source_data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AB92B31B738DE800AB5194 /* source_data.cpp */; };
 		67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A39D21B727589001DDB91 /* source_to_element_test.cpp */; };
+		67AB92CF1B75156000AB5194 /* classificator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E41A4C28D5005EEA39 /* classificator_tests.cpp */; };
+		67AB92D01B75156400AB5194 /* coasts_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E51A4C28D5005EEA39 /* coasts_test.cpp */; };
+		67AB92D11B75156700AB5194 /* feature_builder_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E61A4C28D5005EEA39 /* feature_builder_test.cpp */; };
+		67AB92D21B75156B00AB5194 /* feature_merger_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E71A4C28D5005EEA39 /* feature_merger_test.cpp */; };
+		67AB92D31B75156E00AB5194 /* osm_id_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E81A4C28D5005EEA39 /* osm_id_test.cpp */; };
+		67AB92D41B75157100AB5194 /* osm_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1E91A4C28D5005EEA39 /* osm_parser_test.cpp */; };
+		67AB92D51B75157400AB5194 /* osm_type_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EA1A4C28D5005EEA39 /* osm_type_test.cpp */; };
+		67AB92D61B75157700AB5194 /* tesselator_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EB1A4C28D5005EEA39 /* tesselator_test.cpp */; };
+		67AB92D71B75157A00AB5194 /* triangles_tree_coding_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C1EC1A4C28D5005EEA39 /* triangles_tree_coding_test.cpp */; };
+		67AB92D81B75157D00AB5194 /* metadata_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6726C26C1A4C5009005EEA39 /* metadata_test.cpp */; };
+		67AB92D91B75158300AB5194 /* osm_o5m_source_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6764B8931ADD6FC100DD8B15 /* osm_o5m_source_test.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -440,8 +451,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				67AB92D51B75157400AB5194 /* osm_type_test.cpp in Sources */,
+				67AB92D41B75157100AB5194 /* osm_parser_test.cpp in Sources */,
+				67AB92D81B75157D00AB5194 /* metadata_test.cpp in Sources */,
+				67AB92D71B75157A00AB5194 /* triangles_tree_coding_test.cpp in Sources */,
+				67AB92CF1B75156000AB5194 /* classificator_tests.cpp in Sources */,
+				67AB92D01B75156400AB5194 /* coasts_test.cpp in Sources */,
+				67AB92D91B75158300AB5194 /* osm_o5m_source_test.cpp in Sources */,
+				67AB92D61B75157700AB5194 /* tesselator_test.cpp in Sources */,
 				6726C2411A4C2D9F005EEA39 /* testingmain.cpp in Sources */,
+				67AB92D21B75156B00AB5194 /* feature_merger_test.cpp in Sources */,
 				67AB92C31B73C29000AB5194 /* source_to_element_test.cpp in Sources */,
+				67AB92D31B75156E00AB5194 /* osm_id_test.cpp in Sources */,
+				67AB92D11B75156700AB5194 /* feature_builder_test.cpp in Sources */,
 				67AB92C21B73C27300AB5194 /* source_data.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;