Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/Makefile
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/Makefile
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/Makefile
@@ -2,5 +2,7 @@
 
 USE_LIBCPP := 1
 
-CXXFLAGS_EXTRAS := -std=c++14
+# We need debug info tuning for lldb in order to emit the preferred name for
+# std::string. See https://reviews.llvm.org/D145803.
+CXXFLAGS_EXTRAS := -std=c++14 -glldb
 include Makefile.rules
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/Makefile
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/Makefile
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/Makefile
@@ -2,5 +2,7 @@
 
 USE_LIBCPP := 1
 
-CXXFLAGS_EXTRAS := -std=c++14
+# We need debug info tuning for lldb in order to emit the preferred name for
+# std::string. See https://reviews.llvm.org/D145803.
+CXXFLAGS_EXTRAS := -std=c++14 -glldb
 include Makefile.rules