diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/Makefile b/lldb/test/functionalities/data-formatter/rdar-9973865/Makefile
index 314f1cb2f077..32d3f4fa9bff 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9973865/Makefile
+++ b/lldb/test/functionalities/data-formatter/rdar-9973865/Makefile
@@ -2,4 +2,10 @@ LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
+# Workaround for llvm.org/pr16214: clang doesn't emit structure definition DWARF
+# information without the flag below.
+ifneq (,$(findstring clang,$(CC)))
+  CFLAGS_EXTRAS := -fno-limit-debug-info
+endif
+
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
index 51206b583352..0aa619bf0f37 100644
--- a/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
+++ b/lldb/test/functionalities/data-formatter/rdar-9973865/Test-rdar-9973865.py
@@ -23,8 +23,6 @@ class Radar9973865DataFormatterTestCase(TestBase):
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test data formatter commands."""
-        if "clang" in self.getCompiler() and "3.4" in self.getCompilerVersion():
-            self.skipTest("llvm.org/pr16191")
 
         self.buildDwarf()
         self.data_formatter_commands()