diff --git a/lldb/test/expression_command/call-function/Makefile b/lldb/test/expression_command/call-function/Makefile
index 6a87edf485bc..01a5853b5a85 100644
--- a/lldb/test/expression_command/call-function/Makefile
+++ b/lldb/test/expression_command/call-function/Makefile
@@ -2,6 +2,13 @@ LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
 
 clean::
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
index 6b5bceeaf05d..b6e6d3a8b0f2 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
@@ -2,6 +2,13 @@ LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
 
 CXXFLAGS += -O0
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
index dd3264de9d8f..5644d9047b23 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
@@ -5,4 +5,11 @@ CXX_SOURCES := main.cpp
 CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
index dd3264de9d8f..991968967690 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
@@ -5,4 +5,11 @@ CXX_SOURCES := main.cpp
 CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
index dd3264de9d8f..991968967690 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
@@ -5,4 +5,11 @@ CXX_SOURCES := main.cpp
 CFLAGS_EXTRAS := -O0
 USE_LIBSTDCPP := 1
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/Makefile b/lldb/test/functionalities/data-formatter/data-formatter-synth/Makefile
index 314f1cb2f077..011cc07b319d 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synth/Makefile
+++ b/lldb/test/functionalities/data-formatter/data-formatter-synth/Makefile
@@ -2,4 +2,11 @@ LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/rdar-9974002/Makefile b/lldb/test/functionalities/data-formatter/rdar-9974002/Makefile
index 314f1cb2f077..011cc07b319d 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9974002/Makefile
+++ b/lldb/test/functionalities/data-formatter/rdar-9974002/Makefile
@@ -2,4 +2,11 @@ LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/stringprinter/Makefile b/lldb/test/functionalities/data-formatter/stringprinter/Makefile
index 3e2b0187b954..2f9316665693 100644
--- a/lldb/test/functionalities/data-formatter/stringprinter/Makefile
+++ b/lldb/test/functionalities/data-formatter/stringprinter/Makefile
@@ -1,4 +1,12 @@
 LEVEL = ../../../make
 CXX_SOURCES := main.cpp
 CXXFLAGS += -std=c++11
+
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/type_completion/Makefile b/lldb/test/functionalities/type_completion/Makefile
index 8a7102e347af..afb2a26e7072 100644
--- a/lldb/test/functionalities/type_completion/Makefile
+++ b/lldb/test/functionalities/type_completion/Makefile
@@ -2,4 +2,11 @@ LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS += -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/lang/cpp/stl/Makefile b/lldb/test/lang/cpp/stl/Makefile
index fe27980afe9b..22f335d8f9c7 100644
--- a/lldb/test/lang/cpp/stl/Makefile
+++ b/lldb/test/lang/cpp/stl/Makefile
@@ -5,4 +5,11 @@ CFLAGS := -g -O0
 
 clean: OBJECTS+=$(wildcard main.d.*)
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/python_api/sbvalue_persist/Makefile b/lldb/test/python_api/sbvalue_persist/Makefile
index ddffdcfb62d6..e7466655cfe6 100644
--- a/lldb/test/python_api/sbvalue_persist/Makefile
+++ b/lldb/test/python_api/sbvalue_persist/Makefile
@@ -5,4 +5,11 @@ CXX_SOURCES := main.cpp
 # Clean renamed executable on 'make clean'
 clean: OBJECTS+=no_synth
 
+# clang-3.5+ outputs FullDebugInfo by default for Darwin/FreeBSD 
+# targets.  Other targets do not, which causes this test to fail.
+# This flag enables FullDebugInfo for all targets.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fstandalone-debug
+endif
+
 include $(LEVEL)/Makefile.rules