diff --git a/clang/test/CodeGen/avr/target-cpu-defines/atmega328p.c b/clang/test/CodeGen/avr/target-cpu-defines/atmega328p.c
deleted file mode 100644
--- a/clang/test/CodeGen/avr/target-cpu-defines/atmega328p.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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
-// CHECK: #define __AVR 1
-// CHECK: #define __AVR_ATmega328P__ 1
-// CHECK: #define __AVR__ 1
-// CHECK: #define __ELF__ 1
diff --git a/clang/test/CodeGen/avr/target-cpu-defines/attiny104.c b/clang/test/CodeGen/avr/target-cpu-defines/attiny104.c
deleted file mode 100644
--- a/clang/test/CodeGen/avr/target-cpu-defines/attiny104.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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
-// CHECK: #define __AVR 1
-// CHECK: #define __AVR_ATtiny104__ 1
-// CHECK: #define __AVR__ 1
-// CHECK: #define __ELF__ 1
diff --git a/clang/test/CodeGen/avr/target-cpu-defines/common.c b/clang/test/CodeGen/avr/target-cpu-defines/common.c
deleted file mode 100644
--- a/clang/test/CodeGen/avr/target-cpu-defines/common.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// REQUIRES: avr-registered-target
-// RUN: %clang_cc1 -E -dM -triple avr-unknown-unknown /dev/null | FileCheck -match-full-lines %s
-
-// CHECK: #define AVR 1
-// CHECK: #define __AVR 1
-// CHECK: #define __AVR__ 1
-// CHECK: #define __ELF__ 1
diff --git a/clang/test/Preprocessor/AVR/target-cpu-defines/atmega328p.c b/clang/test/Preprocessor/AVR/target-cpu-defines/atmega328p.c
new file mode 100644
--- /dev/null
+++ b/clang/test/Preprocessor/AVR/target-cpu-defines/atmega328p.c
@@ -0,0 +1,8 @@
+// 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
+// CHECK: #define __AVR 1
+// CHECK: #define __AVR_ATmega328P__ 1
+// CHECK: #define __AVR__ 1
+// CHECK: #define __ELF__ 1
diff --git a/clang/test/Preprocessor/AVR/target-cpu-defines/attiny104.c b/clang/test/Preprocessor/AVR/target-cpu-defines/attiny104.c
new file mode 100644
--- /dev/null
+++ b/clang/test/Preprocessor/AVR/target-cpu-defines/attiny104.c
@@ -0,0 +1,8 @@
+// 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
+// CHECK: #define __AVR 1
+// CHECK: #define __AVR_ATtiny104__ 1
+// CHECK: #define __AVR__ 1
+// CHECK: #define __ELF__ 1
diff --git a/clang/test/Preprocessor/AVR/target-cpu-defines/common.c b/clang/test/Preprocessor/AVR/target-cpu-defines/common.c
new file mode 100644
--- /dev/null
+++ b/clang/test/Preprocessor/AVR/target-cpu-defines/common.c
@@ -0,0 +1,7 @@
+// REQUIRES: avr-registered-target
+// RUN: %clang_cc1 -E -dM -triple avr-unknown-unknown /dev/null | FileCheck -match-full-lines %s
+
+// CHECK: #define AVR 1
+// CHECK: #define __AVR 1
+// CHECK: #define __AVR__ 1
+// CHECK: #define __ELF__ 1