Index: polly/test/GPGPU/double-parallel-loop.ll
===================================================================
--- polly/test/GPGPU/double-parallel-loop.ll
+++ polly/test/GPGPU/double-parallel-loop.ll
@@ -18,7 +18,9 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck %s -check-prefix=KERNEL-ASM
 
-; REQUIRES: pollyacc,nvptx
+; XFAIL: *
+
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; CHECK: Stmt_bb5
 ; CHECK-NEXT:       Domain :=
Index: polly/test/GPGPU/scalar-param-and-value-32-bit.ll
===================================================================
--- polly/test/GPGPU/scalar-param-and-value-32-bit.ll
+++ polly/test/GPGPU/scalar-param-and-value-32-bit.ll
@@ -2,7 +2,9 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck %s
 
-; REQUIRES: pollyacc,nvptx
+; XFAIL: *
+
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 ;
 ;    void foo(float A[], int n) {
 ;      for (long j = 0; j < n; j++)
Index: polly/test/GPGPU/scalar-param-and-value-use.ll
===================================================================
--- polly/test/GPGPU/scalar-param-and-value-use.ll
+++ polly/test/GPGPU/scalar-param-and-value-use.ll
@@ -2,7 +2,9 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck -check-prefix=IR %s
 
-; REQUIRES: pollyacc,nvptx
+; XFAIL: *
+
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ;    void foo(long n, float A[][n]) {
 ;      for (long i = 0; i < 32; i++)
Index: polly/test/GPGPU/scalar-parameter-fp128.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-fp128.ll
+++ polly/test/GPGPU/scalar-parameter-fp128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
Index: polly/test/GPGPU/scalar-parameter-half.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-half.ll
+++ polly/test/GPGPU/scalar-parameter-half.ll
@@ -1,6 +1,6 @@
 ; RUN: opt %loadPolly -polly-codegen-ppcg -polly-acc-dump-code -disable-output %s
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "unexpected type" in the LLVM PTX backend.
 
Index: polly/test/GPGPU/scalar-parameter-i120.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-i120.ll
+++ polly/test/GPGPU/scalar-parameter-i120.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
Index: polly/test/GPGPU/scalar-parameter-i128.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-i128.ll
+++ polly/test/GPGPU/scalar-parameter-i128.ll
@@ -1,8 +1,6 @@
 ; RUN: opt %loadPolly -polly-codegen-ppcg -polly-acc-dump-code -disable-output %s
 
-; XFAIL: *
-
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
Index: polly/test/GPGPU/scalar-parameter-i3000.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-i3000.ll
+++ polly/test/GPGPU/scalar-parameter-i3000.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
Index: polly/test/GPGPU/scalar-parameter-i80.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-i80.ll
+++ polly/test/GPGPU/scalar-parameter-i80.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
Index: polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
+++ polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
Index: polly/test/GPGPU/scalar-parameter-x86_fp80.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter-x86_fp80.ll
+++ polly/test/GPGPU/scalar-parameter-x86_fp80.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc,nvptx
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
Index: polly/test/GPGPU/scalar-parameter.ll
===================================================================
--- polly/test/GPGPU/scalar-parameter.ll
+++ polly/test/GPGPU/scalar-parameter.ll
@@ -10,7 +10,9 @@
 ; RUN: -disable-output -polly-acc-dump-kernel-ir < %s | \
 ; RUN: FileCheck -check-prefix=KERNEL %s
 
-; REQUIRES: pollyacc,nvptx
+; XFAIL: *
+
+; REQUIRES: pollyacc, target=nvptx{{.*}}
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"