diff --git a/clang/test/CodeGen/avr/target-cpu-defines/atmega328p.c b/clang/test/Preprocessor/avr-atmega328p.c
rename from clang/test/CodeGen/avr/target-cpu-defines/atmega328p.c
rename to clang/test/Preprocessor/avr-atmega328p.c
--- a/clang/test/CodeGen/avr/target-cpu-defines/atmega328p.c
+++ b/clang/test/Preprocessor/avr-atmega328p.c
@@ -1,4 +1,3 @@
-// REQUIRES: avr-registered-target
 // RUN: %clang_cc1 -E -dM -triple avr-unknown-unknown -target-cpu atmega328p /dev/null | FileCheck -match-full-lines %s
 
 // CHECK: #define AVR 1
diff --git a/clang/test/CodeGen/avr/target-cpu-defines/attiny104.c b/clang/test/Preprocessor/avr-attiny104.c
rename from clang/test/CodeGen/avr/target-cpu-defines/attiny104.c
rename to clang/test/Preprocessor/avr-attiny104.c
--- a/clang/test/CodeGen/avr/target-cpu-defines/attiny104.c
+++ b/clang/test/Preprocessor/avr-attiny104.c
@@ -1,4 +1,3 @@
-// REQUIRES: avr-registered-target
 // RUN: %clang_cc1 -E -dM -triple avr-unknown-unknown -target-cpu attiny104 /dev/null | FileCheck -match-full-lines %s
 
 // CHECK: #define AVR 1
diff --git a/clang/test/CodeGen/avr/target-cpu-defines/common.c b/clang/test/Preprocessor/avr-common.c
rename from clang/test/CodeGen/avr/target-cpu-defines/common.c
rename to clang/test/Preprocessor/avr-common.c
--- a/clang/test/CodeGen/avr/target-cpu-defines/common.c
+++ b/clang/test/Preprocessor/avr-common.c
@@ -1,4 +1,3 @@
-// REQUIRES: avr-registered-target
 // RUN: %clang_cc1 -E -dM -triple avr-unknown-unknown /dev/null | FileCheck -match-full-lines %s
 
 // CHECK: #define AVR 1