Index: test/expression_command/call-function/Makefile
===================================================================
--- test/expression_command/call-function/Makefile
+++ test/expression_command/call-function/Makefile
@@ -2,6 +2,11 @@
 
 CXX_SOURCES := main.cpp
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
 
 clean::
Index: test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
===================================================================
--- test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -2,6 +2,11 @@
 
 CXX_SOURCES := main.cpp
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
 
 CXXFLAGS += -O0
Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
===================================================================
--- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
@@ -5,4 +5,9 @@
 CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
===================================================================
--- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
@@ -5,4 +5,9 @@
 CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
===================================================================
--- test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
@@ -5,4 +5,9 @@
 CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/data-formatter/data-formatter-synth/Makefile
===================================================================
--- test/functionalities/data-formatter/data-formatter-synth/Makefile
+++ test/functionalities/data-formatter/data-formatter-synth/Makefile
@@ -2,4 +2,9 @@
 
 CXX_SOURCES := main.cpp
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/data-formatter/rdar-9974002/Makefile
===================================================================
--- test/functionalities/data-formatter/rdar-9974002/Makefile
+++ test/functionalities/data-formatter/rdar-9974002/Makefile
@@ -2,4 +2,9 @@
 
 CXX_SOURCES := main.cpp
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/data-formatter/stringprinter/Makefile
===================================================================
--- test/functionalities/data-formatter/stringprinter/Makefile
+++ test/functionalities/data-formatter/stringprinter/Makefile
@@ -1,4 +1,10 @@
 LEVEL = ../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
+
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/functionalities/type_completion/Makefile
===================================================================
--- test/functionalities/type_completion/Makefile
+++ test/functionalities/type_completion/Makefile
@@ -2,4 +2,9 @@
 
 CXX_SOURCES := main.cpp
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/lang/cpp/stl/Makefile
===================================================================
--- test/lang/cpp/stl/Makefile
+++ test/lang/cpp/stl/Makefile
@@ -5,4 +5,9 @@
 
 clean: OBJECTS+=$(wildcard main.d.*)
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
Index: test/lldbtest.py
===================================================================
--- test/lldbtest.py
+++ test/lldbtest.py
@@ -556,8 +556,8 @@
         return compiler in self.getCompiler() and self.expectedCompilerVersion(compiler_version)
     if bugnumber: return expectedFailure(fn, bugnumber)
 
-def expectedFailureClang(bugnumber=None):
-    if bugnumber: return expectedFailureCompiler('clang', None, bugnumber)
+def expectedFailureClang(bugnumber=None, compiler_version=None):
+    if bugnumber: return expectedFailureCompiler('clang', compiler_version, bugnumber)
 
 def expectedFailureGcc(bugnumber=None, compiler_version=None):
     if bugnumber: return expectedFailureCompiler('gcc', compiler_version, bugnumber)
Index: test/python_api/sbvalue_persist/Makefile
===================================================================
--- test/python_api/sbvalue_persist/Makefile
+++ test/python_api/sbvalue_persist/Makefile
@@ -5,4 +5,9 @@
 # Clean renamed executable on 'make clean'
 clean: OBJECTS+=no_synth
 
+# debug info is needed for std::string print
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules