diff --git a/drape/drape_tests/testingmain.cpp b/drape/drape_tests/testingmain.cpp
index 3162df67c7..33b1f03b60 100644
--- a/drape/drape_tests/testingmain.cpp
+++ b/drape/drape_tests/testingmain.cpp
@@ -100,13 +100,13 @@ int main(int argc, char * argv[])
     }
     catch (std::exception const & ex)
     {
-      std::cerr << "FAILED" << endl << "<<<Exception thrown [" << ex.what() << "].>>>" << std::endl;
+      std::cerr << "FAILED" << std::endl << "<<<Exception thrown [" << ex.what() << "].>>>" << std::endl;
       testResults[iTest] = false;
       ++numFailedTests;
     }
     catch (...)
     {
-      std::cerr << "FAILED" << endl << "<<<Unknown exception thrown.>>>" << std::endl;
+      std::cerr << "FAILED" << std::endl << "<<<Unknown exception thrown.>>>" << std::endl;
       testResults[iTest] = false;
       ++numFailedTests;
     }
@@ -126,7 +126,7 @@ int main(int argc, char * argv[])
       if (!testResults[i])
         std::cerr << testNames[i] << std::endl;
     }
-    std::cerr << "Some tests FAILED." << std::endl << flush;
+    std::cerr << "Some tests FAILED." << std::endl << std::flush;
     return 1;
   }
 }
diff --git a/drape/drape_tests/uniform_value_tests.cpp b/drape/drape_tests/uniform_value_tests.cpp
index b7876ab1cc..8318cdc507 100644
--- a/drape/drape_tests/uniform_value_tests.cpp
+++ b/drape/drape_tests/uniform_value_tests.cpp
@@ -54,7 +54,7 @@ void mock_glGetActiveUniform(uint32_t programID, uint32_t index, int32_t * size,
   *size = 1;
   if (index < 9)
   {
-    static std::pair<string, glConst> mockUniforms[9] =
+    static std::pair<std::string, glConst> mockUniforms[9] =
     {
       std::make_pair("position0", gl_const::GLIntType),
       std::make_pair("position1", gl_const::GLIntVec2),