diff --git a/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in b/lldb/lit/Reproducer/Functionalities/Inputs/DataFormatter.in
index 95029123bce8cd..5c4e821656d76f 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 25775516aa9bee..91f27388d0ca11 100644
--- a/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp
+++ b/lldb/lit/Reproducer/Functionalities/Inputs/foo.cpp
@@ -8,6 +8,6 @@ class Foo {
 };
 
 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 5d31f90022665d..370e67d12ef48e 100644
--- a/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
+++ b/lldb/lit/Reproducer/Functionalities/TestDataFormatter.test
@@ -3,7 +3,7 @@
 # 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