diff --git a/clang/test/Driver/systemz-float-02.c b/clang/test/Driver/systemz-float-02.c
index c18a7fa6cdf17..d9ec329485a4c 100644
--- a/clang/test/Driver/systemz-float-02.c
+++ b/clang/test/Driver/systemz-float-02.c
@@ -1,4 +1,5 @@
 // RUN: %clang -target s390x-linux-gnu -march=z13 -S %s -o - -msoft-float | FileCheck %s
+// REQUIRES: systemz-registered-target
 //
 // Check that -msoft-float works all the way to assembly output.
 
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-01.ll b/llvm/test/CodeGen/SystemZ/soft-float-01.ll
index 0d70075d5df5b..cba8124a61413 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-01.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-01.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mcpu=z10 -mattr=soft-float -O0 < %s | FileCheck %s
+; RUN: llc -mtriple=s390x-linux-gnu -mcpu=z10 -mattr=soft-float -O0 < %s | FileCheck %s
 
 ; Arithmetic functions
 
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-03.ll b/llvm/test/CodeGen/SystemZ/soft-float-03.ll
index 96cc03676e307..a53bf357d60b7 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-03.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-03.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mcpu=z13 -mattr=soft-float -O3 < %s | FileCheck %s
+; RUN: llc -mtriple=s390x-linux-gnu -mcpu=z13 -mattr=soft-float -O3 < %s | FileCheck %s
 ;
 ; Check that soft-float implies "-vector".
 
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-04.ll b/llvm/test/CodeGen/SystemZ/soft-float-04.ll
index e939b300c8423..1dbe843090b04 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-04.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-04.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mcpu=z14 -O3 -mattr=soft-float < %s  | FileCheck %s
+; RUN: llc -mtriple=s390x-linux-gnu -mcpu=z14 -O3 -mattr=soft-float < %s  | FileCheck %s
 ;
 ; Check that this function with soft-float does not result in a s390.tdc
 ; intrinsic (which cannot be handled by SoftenFloatOperand).
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-args.ll b/llvm/test/CodeGen/SystemZ/soft-float-args.ll
index d9dc305502c38..06b362672b1f6 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-args.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-args.ll
@@ -1,4 +1,4 @@
-; RUN: llc -mcpu=z13 -mattr=soft-float -O3 < %s | FileCheck %s
+; RUN: llc -mtriple=s390x-linux-gnu -mcpu=z13 -mattr=soft-float -O3 < %s | FileCheck %s
 ;
 ; Test that arguments and return values of fp/vector types are always handled
 ; with gprs with soft-float.
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-01.ll b/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-01.ll
index 0d84c9056f510..728ff2f512636 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-01.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-01.ll
@@ -1,4 +1,4 @@
-; RUN: not llc < %s -mcpu=z13 -mattr=soft-float -O3 2>&1 | FileCheck %s
+; RUN: not llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 -mattr=soft-float -O3 2>&1 | FileCheck %s
 ;
 ; Verify that inline asms cannot use fp/vector registers with soft-float.
 
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-02.ll b/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-02.ll
index 3db346d8214cc..c523c05981d8e 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-02.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-02.ll
@@ -1,4 +1,4 @@
-; RUN: not llc < %s -mcpu=z13 -mattr=soft-float -O3 2>&1 | FileCheck %s
+; RUN: not llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 -mattr=soft-float -O3 2>&1 | FileCheck %s
 ;
 ; Verify that inline asms cannot use fp/vector registers with soft-float.
 
diff --git a/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-03.ll b/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-03.ll
index e31434c5b55d6..f382ad367aaac 100644
--- a/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-03.ll
+++ b/llvm/test/CodeGen/SystemZ/soft-float-inline-asm-03.ll
@@ -1,4 +1,4 @@
-; RUN: not llc < %s -mcpu=z13 -mattr=soft-float -O3 2>&1 | FileCheck %s
+; RUN: not llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 -mattr=soft-float -O3 2>&1 | FileCheck %s
 ;
 ; Verify that inline asms cannot use fp/vector registers with soft-float.