diff --git a/clang/test/CodeGen/debug-info-unused-types.c b/clang/test/CodeGen/debug-info-unused-types.c
--- a/clang/test/CodeGen/debug-info-unused-types.c
+++ b/clang/test/CodeGen/debug-info-unused-types.c
@@ -1,8 +1,8 @@
-// RUN: %clang -fno-eliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck %s
-// RUN: %clang -fno-eliminate-unused-debug-types -g1 -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
-// RUN: %clang -feliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
-// RUN: %clang -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
-// RUN: %clang -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clang --target=x86_64-linux-gnu -fno-eliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck %s
+// RUN: %clang --target=x86_64-linux-gnu -fno-eliminate-unused-debug-types -g1 -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clang --target=x86_64-linux-gnu -feliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clang --target=x86_64-linux-gnu -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clang --target=x86_64-linux-gnu -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
 typedef int my_int;
 struct foo {};
 enum bar { BAR };
diff --git a/clang/test/CodeGen/debug-info-unused-types.cpp b/clang/test/CodeGen/debug-info-unused-types.cpp
--- a/clang/test/CodeGen/debug-info-unused-types.cpp
+++ b/clang/test/CodeGen/debug-info-unused-types.cpp
@@ -1,8 +1,8 @@
-// RUN: %clangxx -fno-eliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck %s
-// RUN: %clangxx -fno-eliminate-unused-debug-types -g1 -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
-// RUN: %clangxx -feliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
-// RUN: %clangxx -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
-// RUN: %clangxx -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clangxx --target=x86_64-linux-gnu -fno-eliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck %s
+// RUN: %clangxx --target=x86_64-linux-gnu -fno-eliminate-unused-debug-types -g1 -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clangxx --target=x86_64-linux-gnu -feliminate-unused-debug-types -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clangxx --target=x86_64-linux-gnu -g -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
+// RUN: %clangxx --target=x86_64-linux-gnu -emit-llvm -S -o - %s | FileCheck --check-prefix=NODBG %s
 using foo = int;
 class bar {};
 enum class baz { BAZ };
diff --git a/clang/test/Driver/debug-options.c b/clang/test/Driver/debug-options.c
--- a/clang/test/Driver/debug-options.c
+++ b/clang/test/Driver/debug-options.c
@@ -366,7 +366,7 @@
 // RUN:        | FileCheck -check-prefix=DEBUG_UNUSED_TYPES %s
 // DEBUG_UNUSED_TYPES: "-debug-info-kind=unused-types"
 // DEBUG_UNUSED_TYPES-NOT: "-debug-info-kind=limited"
-// RUN: %clang -### -g -feliminate-unused-debug-types -c %s 2>&1 \
+// RUN: %clang -### -g -feliminate-unused-debug-types -c %s --target=x86_64-linux-gnu 2>&1 \
 // RUN:        | FileCheck -check-prefix=NO_DEBUG_UNUSED_TYPES %s
 // NO_DEBUG_UNUSED_TYPES: "-debug-info-kind=limited"
 // NO_DEBUG_UNUSED_TYPES-NOT: "-debug-info-kind=unused-types"