diff --git a/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in b/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in
index 95029123bce8..5c4e821656d7 100644
--- a/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in
+++ b/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in
@@ -1,7 +1,7 @@
 breakpoint set -f foo.cpp -l 11
 run
-frame var
+frame var foo
 next
-frame var
+frame var foo
 cont
 reproducer generate
diff --git a/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp b/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp
index 25775516aa9b..91f27388d0ca 100644
--- a/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp
+++ b/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp
@@ -1,13 +1,13 @@
 class Foo {
 public:
   Foo(int i, double d) : m_i(i), m_d(d){};
 
 private:
   int m_i;
   int m_d;
 };
 
 int main(int argc, char **argv) {
-  Foo foo(1, 2.22);
+  static Foo foo(1, 2.22);
   return 0;
 }
diff --git a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test b/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
index 5d31f9002266..370e67d12ef4 100644
--- a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
+++ b/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
@@ -1,16 +1,16 @@
 # UNSUPPORTED: system-windows, system-freebsd
 
 # This tests that data formatters continue to work when replaying a reproducer.
 
 # RUN: rm -rf %t.repro
-# RUN: %clang %S/Inputs/foo.cpp -g -o %t.out
+# RUN: %clangxx %S/Inputs/foo.cpp -g -o %t.out
 
 # RUN: %lldb -x -b -s %S/Inputs/DataFormatter.in --capture %t.repro %t.out | FileCheck %s
 # RUN: %lldb --replay %t.repro | FileCheck %s
 
 # CHECK: stop reason = breakpoint 1.1
 # CHECK: (Foo) foo = (m_i = 0, m_d = 0)
 # CHECK: stop reason = step over
 # CHECK: (Foo) foo = (m_i = 1, m_d = 2)
 # CHECK: Process {{.*}} resuming
 # CHECK: Process {{.*}} exited with status = 0