diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py b/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
index f23bd5b3b70e..1b97c3b0333f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
@@ -90,6 +90,32 @@ class CommandLineCompletionTestCase(TestBase):
                               ['mips',
                                'arm64'])
 
+    @skipIfFreeBSD  # timing out on the FreeBSD buildbot
+    def test_quoted_command(self):
+        self.complete_from_to('"set',
+                              ['"settings" '])
+
+    @skipIfFreeBSD  # timing out on the FreeBSD buildbot
+    def test_quoted_arg_with_quoted_command(self):
+        self.complete_from_to('"settings" "repl',
+                              ['"replace" '])
+
+    @skipIfFreeBSD  # timing out on the FreeBSD buildbot
+    def test_quoted_arg_without_quoted_command(self):
+        self.complete_from_to('settings "repl',
+                              ['"replace" '])
+
+    @skipIfFreeBSD  # timing out on the FreeBSD buildbot
+    def test_single_quote_command(self):
+        self.complete_from_to("'set",
+                              ["'settings' "])
+
+    @skipIfFreeBSD  # timing out on the FreeBSD buildbot
+    def test_terminated_quote_command(self):
+        # This should not crash, but we don't get any
+        # reasonable completions from this.
+        self.complete_from_to("'settings'", [])
+
     @skipIfFreeBSD  # timing out on the FreeBSD buildbot
     def test_process_launch_arch_arm(self):
         self.complete_from_to('process launch --arch arm',