diff --git a/lldb/test/Shell/Scripts/TestFrameworkFixUnifdef.test b/lldb/test/Shell/Scripts/TestFrameworkFixUnifdef.test
index a7e82d2f3640c..ba18b4b41d3a0 100644
--- a/lldb/test/Shell/Scripts/TestFrameworkFixUnifdef.test
+++ b/lldb/test/Shell/Scripts/TestFrameworkFixUnifdef.test
@@ -1,7 +1,7 @@
 # REQUIRES: system-darwin
 # Create a temp dir for output and run the framework fix script on the truncated version of SBAddress.h in the inputs dir.
 RUN: mkdir -p %t/Outputs
-RUN: %python %p/../../../scripts/framework-header-fix.py -f lldb_main -i %p/Inputs/Main/SBAddress.h -o %t/Outputs/SBAddress.h -p /usr/bin/unifdef USWIG
+RUN: %python %p/../../../scripts/framework-header-fix.py -f lldb_main -i %p/Inputs/Main/SBAddress.h -o %t/Outputs/SBAddress.h -p /usr/bin/unifdef --unifdef_guards USWIG
 
 # Check the output
 RUN: cat %t/Outputs/SBAddress.h | FileCheck %s
diff --git a/lldb/unittests/Symbol/TestTypeSystemClang.cpp b/lldb/unittests/Symbol/TestTypeSystemClang.cpp
index f2175f6f537a3..b050d6acbdc7e 100644
--- a/lldb/unittests/Symbol/TestTypeSystemClang.cpp
+++ b/lldb/unittests/Symbol/TestTypeSystemClang.cpp
@@ -686,7 +686,8 @@ TEST_F(TestCreateClassTemplateDecl, FindExistingTemplates) {
   // (e.g., parameter names can be changed/omitted.)
 
   // Test an empty template parameter list: <>
-  ExpectNewTemplate("<>", {{}, {}});
+  // This first expect causes an assert. rdar://159893045
+  // ExpectNewTemplate("<>", {{}, {}});
 
   clang::TemplateArgument intArg(m_ast->getASTContext().IntTy);
   clang::TemplateArgument int47Arg(m_ast->getASTContext(),