diff --git a/clang/test/CodeGen/address-space-avr.c b/clang/test/CodeGen/avr/address-space-avr.c
rename from clang/test/CodeGen/address-space-avr.c
rename to clang/test/CodeGen/avr/address-space-avr.c
diff --git a/clang/test/CodeGen/alias-avr.c b/clang/test/CodeGen/avr/alias-avr.c
rename from clang/test/CodeGen/alias-avr.c
rename to clang/test/CodeGen/avr/alias-avr.c
diff --git a/clang/test/CodeGen/avr-builtins.c b/clang/test/CodeGen/avr/avr-builtins.c
rename from clang/test/CodeGen/avr-builtins.c
rename to clang/test/CodeGen/avr/avr-builtins.c
diff --git a/clang/test/CodeGen/avr-flash.c b/clang/test/CodeGen/avr/avr-flash.c
rename from clang/test/CodeGen/avr-flash.c
rename to clang/test/CodeGen/avr/avr-flash.c
diff --git a/clang/test/CodeGen/avr-inline-asm-constraints.c b/clang/test/CodeGen/avr/avr-inline-asm-constraints.c
rename from clang/test/CodeGen/avr-inline-asm-constraints.c
rename to clang/test/CodeGen/avr/avr-inline-asm-constraints.c
diff --git a/clang/test/CodeGen/avr-unsupported-inline-asm-constraints.c b/clang/test/CodeGen/avr/avr-unsupported-inline-asm-constraints.c
rename from clang/test/CodeGen/avr-unsupported-inline-asm-constraints.c
rename to clang/test/CodeGen/avr/avr-unsupported-inline-asm-constraints.c