diff --git a/debuginfo-tests/CMakeLists.txt b/debuginfo-tests/CMakeLists.txt
--- a/debuginfo-tests/CMakeLists.txt
+++ b/debuginfo-tests/CMakeLists.txt
@@ -2,10 +2,10 @@
 # various types of debug info, and then run those programs under a debugger
 # such as GDB or LLDB to verify the results.
 
-add_llvm_executable(prettyprinters
-        llvm-prettyprinters/gdb/prettyprinters.cpp
+add_llvm_executable(llvm-support
+        visualizer-tests/gdb/llvm-support.cpp
 )
-target_link_libraries(prettyprinters PRIVATE LLVMSupport)
+target_link_libraries(llvm-support PRIVATE LLVMSupport)
 
 set(DEBUGINFO_TESTS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DEBUGINFO_TESTS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -15,8 +15,8 @@
   FileCheck
   count
   llvm-objdump
+  llvm-support
   not
-  prettyprinters
   )
 
 # The Windows builder scripts pass -fuse-ld=lld.
diff --git a/debuginfo-tests/llvm-prettyprinters/gdb/lit.local.cfg b/debuginfo-tests/visualizer-tests/gdb/lit.local.cfg
rename from debuginfo-tests/llvm-prettyprinters/gdb/lit.local.cfg
rename to debuginfo-tests/visualizer-tests/gdb/lit.local.cfg
diff --git a/debuginfo-tests/llvm-prettyprinters/gdb/prettyprinters.cpp b/debuginfo-tests/visualizer-tests/gdb/llvm-support.cpp
rename from debuginfo-tests/llvm-prettyprinters/gdb/prettyprinters.cpp
rename to debuginfo-tests/visualizer-tests/gdb/llvm-support.cpp
--- a/debuginfo-tests/llvm-prettyprinters/gdb/prettyprinters.cpp
+++ b/debuginfo-tests/visualizer-tests/gdb/llvm-support.cpp
@@ -47,4 +47,8 @@
   return Result;
 }();
 
+// Check expected instances to avoid compile errors.
+auto CheckExpectedValue = static_cast<bool>(ExpectedValue);
+auto CheckExpectedError = static_cast<bool>(ExpectedError);
+
 int main() { return 0; }
diff --git a/debuginfo-tests/llvm-prettyprinters/gdb/prettyprinters.gdb b/debuginfo-tests/visualizer-tests/gdb/llvm-support.gdb
rename from debuginfo-tests/llvm-prettyprinters/gdb/prettyprinters.gdb
rename to debuginfo-tests/visualizer-tests/gdb/llvm-support.gdb
--- a/debuginfo-tests/llvm-prettyprinters/gdb/prettyprinters.gdb
+++ b/debuginfo-tests/visualizer-tests/gdb/llvm-support.gdb
@@ -1,4 +1,4 @@
-# RUN: gdb -q -batch -n -iex 'source %llvm_src_root/utils/gdb-scripts/prettyprinters.py' -x %s %llvm_tools_dir/prettyprinters | FileCheck %s
+# RUN: gdb -q -batch -n -iex 'source %llvm_src_root/utils/gdb-scripts/prettyprinters.py' -x %s %llvm_tools_dir/llvm-support | FileCheck %s
 
 break main
 run