diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
index a7501e359051..e5966feade91 100644
--- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py
+++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py
@@ -87,8 +87,7 @@ class AbbreviationsTestCase(TestBase):
                     patterns = [ "Current executable set to .*a.out.*" ])
 
         self.expect("_regexp-b product",
-                    substrs = [ "breakpoint set --name 'product'",
-                                "Breakpoint created: 1: name = 'product', locations = 1" ])
+                    substrs = [ "Breakpoint created: 1: name = 'product', locations = 1" ])
 
         self.expect("br s -n sum",
                     startstr = "Breakpoint created: 2: name = 'sum', locations = 1")
diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
index 3c40e650d276..c4ec8c54851b 100644
--- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
@@ -32,6 +32,10 @@ class CommonShortSpellingsTestCase(TestBase):
         self.expect("br s -n sum",
             startstr = "Breakpoint created: 1: name = 'sum', locations = 1")
 
+        self.runCmd("settings set interpreter.expand-regex-aliases true")
+        self.addTearDownHook(
+            lambda: self.runCmd("settings set interpreter.expand-regex-aliases false"))
+        
         # disp -> display
         self.expect("disp a",
             startstr = "target stop-hook add -o")