diff --git a/debuginfo-tests/lit.cfg.py b/debuginfo-tests/lit.cfg.py
--- a/debuginfo-tests/lit.cfg.py
+++ b/debuginfo-tests/lit.cfg.py
@@ -115,7 +115,7 @@
 # Set up commands for DexTer regression tests.
 # Builder, debugger, optimisation level and several other flags differ
 # depending on whether we're running a unix like or windows os.
-if platform.system() == 'Windows': 
+if platform.system() == 'Windows':
   dexter_regression_test_builder = '--builder clang-cl_vs2015'
   dexter_regression_test_debugger = '--debugger dbgeng'
   dexter_regression_test_cflags = '--cflags "/Zi /Od"'
@@ -157,3 +157,6 @@
         if apple_lldb_vers < 1000:
             config.available_features.add('apple-lldb-pre-1000')
 
+llvm_config.feature_config([('--build-mode', {
+    'Debug|RelWithDebInfo': 'debug-info'
+})])
diff --git a/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb b/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb
--- a/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb
+++ b/debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.gdb
@@ -1,4 +1,5 @@
 # RUN: gdb -q -batch -n -iex 'source %llvm_src_root/utils/gdb-scripts/prettyprinters.py' -x %s %llvm_tools_dir/check-gdb-llvm-support | FileCheck %s --dump-input-on-failure
+# REQUIRES: debug-info
 
 break main
 run