diff --git a/lldb/test/embedded_interpreter/Makefile b/lldb/test/embedded_interpreter/Makefile
new file mode 100644
index 000000000000..d6cd0db0506f
--- /dev/null
+++ b/lldb/test/embedded_interpreter/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../make
+
+C_SOURCES := main.c
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/embedded_interpreter/TestConvenienceVariables.py
new file mode 100644
index 000000000000..0767db5d722a
--- /dev/null
+++ b/lldb/test/embedded_interpreter/TestConvenienceVariables.py
@@ -0,0 +1,88 @@
+"""Test convenience variables when you drop in from lldb prompt into an embedded interpreter."""
+
+import os
+import unittest2
+import lldb
+import pexpect
+from lldbtest import *
+
+class ConvenienceVariablesCase(TestBase):
+
+    mydir = "embedded_interpreter"
+
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
+    def test_with_dsym_and_run_command(self):
+        """Test convenience variables lldb.debugger, lldb.target, lldb.process, lldb.thread, and lldb.frame."""
+        self.buildDsym()
+        self.convenience_variables()
+
+    @python_api_test
+    def test_with_dwarf_and_process_launch_api(self):
+        """Test convenience variables lldb.debugger, lldb.target, lldb.process, lldb.thread, and lldb.frame."""
+        self.buildDwarf()
+        self.convenience_variables()
+
+    def setUp(self):
+        # Call super's setUp().
+        TestBase.setUp(self)
+        # Find the line number to break on inside main.cpp.
+        self.line = line_number('main.c', 'Hello world.')
+
+    def convenience_variables(self):
+        """Test convenience variables lldb.debugger, lldb.target, lldb.process, lldb.thread, and lldb.frame."""
+        exe = os.path.join(os.getcwd(), "a.out")
+        prompt = "(lldb) "
+        python_prompt = ">>> "
+
+        # So that the child gets torn down after the test.
+        self.child = pexpect.spawn('%s %s' % (self.lldbExec, exe))
+        child = self.child
+        # Turn on logging for what the child sends back.
+        if self.TraceOn():
+            child.logfile_read = sys.stdout
+
+        # Set the breakpoint, run the inferior, when it breaks, issue print on
+        # the various convenience variables.
+        child.expect_exact(prompt)
+        child.sendline('breakpoint set -f main.c -l %d' % self.line)
+        child.expect_exact(prompt)
+        child.sendline('run')
+        child.expect_exact(prompt)
+        child.sendline('script')
+        child.expect_exact(python_prompt)
+
+        # Set a flag so that we know during teardown time, we need to exit the
+        # Python interpreter, then the lldb interpreter.
+        self.child_in_script_interpreter = True
+
+        child.sendline('print lldb.debugger')
+        child.expect_exact(python_prompt)
+        self.expect(child.before, exe=False,
+            patterns = ['Debugger \(instance: .*, id: \d\)'])
+
+        child.sendline('print lldb.target')
+        child.expect_exact(python_prompt)
+        self.expect(child.before, exe=False,
+            substrs = ['a.out'])
+
+        child.sendline('print lldb.process')
+        child.expect_exact(python_prompt)
+        self.expect(child.before, exe=False,
+            patterns = ['SBProcess: pid = \d+, state = stopped, threads = \d, executable = a.out'])
+
+        child.sendline('print lldb.thread')
+        child.expect_exact(python_prompt)
+        self.expect(child.before, exe=False,
+            patterns = ['SBThread: tid = 0x[0-9a-f]+'])
+
+        child.sendline('print lldb.frame')
+        child.expect_exact(python_prompt)
+        self.expect(child.before, exe=False,
+            substrs = ['frame #0', 'main.c:%d' % self.line])
+
+
+if __name__ == '__main__':
+    import atexit
+    lldb.SBDebugger.Initialize()
+    atexit.register(lambda: lldb.SBDebugger.Terminate())
+    unittest2.main()
diff --git a/lldb/test/embedded_interpreter/main.c b/lldb/test/embedded_interpreter/main.c
new file mode 100644
index 000000000000..277aa54a4eea
--- /dev/null
+++ b/lldb/test/embedded_interpreter/main.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main(int argc, char const *argv[]) {
+    printf("Hello world.\n");
+    return 0;
+}
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 35c2595d2b97..6b842182c73d 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -529,6 +529,7 @@ class TestBase(unittest2.TestCase):
         # This is for the case of directly spawning 'lldb' and interacting with it
         # using pexpect.
         self.child = None
+        self.child_in_script_interpreter = False
 
         # There is no process associated with the debugger as yet.
         # See also self.tearDown() where it checks whether self.process has a
@@ -682,6 +683,9 @@ class TestBase(unittest2.TestCase):
         if self.child and self.child.isalive():
             with recording(self, traceAlways) as sbuf:
                 print >> sbuf, "tearing down the child process...."
+            if self.child_in_script_interpreter:
+                self.child.sendline('quit()')
+                self.child.expect_exact('(lldb) ')
             self.child.sendline('quit')
             try:
                 self.child.expect(pexpect.EOF)