diff --git a/polly/test/GPGPU/double-parallel-loop.ll b/polly/test/GPGPU/double-parallel-loop.ll
index bfa12b6782a0..b52d351fadbd 100644
--- a/polly/test/GPGPU/double-parallel-loop.ll
+++ b/polly/test/GPGPU/double-parallel-loop.ll
@@ -18,7 +18,7 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck %s -check-prefix=KERNEL-ASM
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; CHECK: Stmt_bb5
 ; CHECK-NEXT:       Domain :=
diff --git a/polly/test/GPGPU/scalar-param-and-value-32-bit.ll b/polly/test/GPGPU/scalar-param-and-value-32-bit.ll
index ffc6e676ae09..7aabde083d9b 100644
--- a/polly/test/GPGPU/scalar-param-and-value-32-bit.ll
+++ b/polly/test/GPGPU/scalar-param-and-value-32-bit.ll
@@ -2,7 +2,7 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 ;
 ;    void foo(float A[], int n) {
 ;      for (long j = 0; j < n; j++)
diff --git a/polly/test/GPGPU/scalar-param-and-value-use.ll b/polly/test/GPGPU/scalar-param-and-value-use.ll
index 24576c922c91..6853fcf04d93 100644
--- a/polly/test/GPGPU/scalar-param-and-value-use.ll
+++ b/polly/test/GPGPU/scalar-param-and-value-use.ll
@@ -2,7 +2,7 @@
 ; RUN: -disable-output < %s | \
 ; RUN: FileCheck -check-prefix=IR %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ;    void foo(long n, float A[][n]) {
 ;      for (long i = 0; i < 32; i++)
diff --git a/polly/test/GPGPU/scalar-parameter-fp128.ll b/polly/test/GPGPU/scalar-parameter-fp128.ll
index 0496a9902d79..d43de165dcd1 100644
--- a/polly/test/GPGPU/scalar-parameter-fp128.ll
+++ b/polly/test/GPGPU/scalar-parameter-fp128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter-half.ll b/polly/test/GPGPU/scalar-parameter-half.ll
index 70ddadd1334a..d55ae1adfb97 100644
--- a/polly/test/GPGPU/scalar-parameter-half.ll
+++ b/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
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "unexpected type" in the LLVM PTX backend.
 
diff --git a/polly/test/GPGPU/scalar-parameter-i120.ll b/polly/test/GPGPU/scalar-parameter-i120.ll
index 27e1d44f63a1..087857a595c9 100644
--- a/polly/test/GPGPU/scalar-parameter-i120.ll
+++ b/polly/test/GPGPU/scalar-parameter-i120.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter-i128.ll b/polly/test/GPGPU/scalar-parameter-i128.ll
index 9750abd62546..55c1273b453c 100644
--- a/polly/test/GPGPU/scalar-parameter-i128.ll
+++ b/polly/test/GPGPU/scalar-parameter-i128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
diff --git a/polly/test/GPGPU/scalar-parameter-i3000.ll b/polly/test/GPGPU/scalar-parameter-i3000.ll
index 49c46a7ba4a6..4203c2f8b0c3 100644
--- a/polly/test/GPGPU/scalar-parameter-i3000.ll
+++ b/polly/test/GPGPU/scalar-parameter-i3000.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
diff --git a/polly/test/GPGPU/scalar-parameter-i80.ll b/polly/test/GPGPU/scalar-parameter-i80.ll
index 39b6d3c2365d..b2f8f2c01e6c 100644
--- a/polly/test/GPGPU/scalar-parameter-i80.ll
+++ b/polly/test/GPGPU/scalar-parameter-i80.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "LowerFormalArguments didn't emit the correct number of
 ;                        values!"
diff --git a/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll b/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
index 66a65b23e783..6290b1830698 100644
--- a/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
+++ b/polly/test/GPGPU/scalar-parameter-ppc_fp128.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter-x86_fp80.ll b/polly/test/GPGPU/scalar-parameter-x86_fp80.ll
index 0496a9902d79..d43de165dcd1 100644
--- a/polly/test/GPGPU/scalar-parameter-x86_fp80.ll
+++ b/polly/test/GPGPU/scalar-parameter-x86_fp80.ll
@@ -2,7 +2,7 @@
 
 ; XFAIL: *
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 ; This fails today with "type mismatch between callee prototype and arguments"
 
diff --git a/polly/test/GPGPU/scalar-parameter.ll b/polly/test/GPGPU/scalar-parameter.ll
index c361f97152ff..73a51e889e33 100644
--- a/polly/test/GPGPU/scalar-parameter.ll
+++ b/polly/test/GPGPU/scalar-parameter.ll
@@ -10,7 +10,7 @@
 ; RUN: -disable-output -polly-acc-dump-kernel-ir < %s | \
 ; RUN: FileCheck -check-prefix=KERNEL %s
 
-; REQUIRES: pollyacc
+; REQUIRES: pollyacc,nvptx
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
diff --git a/polly/test/lit.site.cfg.in b/polly/test/lit.site.cfg.in
index 0132268bd303..71ec8ef46c39 100644
--- a/polly/test/lit.site.cfg.in
+++ b/polly/test/lit.site.cfg.in
@@ -9,6 +9,7 @@ config.polly_lib_dir = "@POLLY_LIB_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.enable_gpgpu_codegen = "@GPU_CODEGEN@"
 config.link_polly_into_tools = "@LINK_POLLY_INTO_TOOLS@"
+config.targets_to_build = "@TARGETS_TO_BUILD@"
 
 ## Check the current platform with regex
 import re
@@ -16,6 +17,9 @@ EAT_ERR_ON_X86 = ' '
 if (re.match(r'^x86_64*', '@TARGET_TRIPLE@') == None) :
   EAT_ERR_ON_X86 = '|| echo \"error is eaten\"'
 
+for arch in config.targets_to_build.split():
+    config.available_features.add(arch.lower() + '-registered-target')
+
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try: