diff --git a/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/avr/include/.keep b/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/avr/include/.keep
new file mode 100644
diff --git a/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/avr/lib/libavr.a b/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/avr/lib/libavr.a
new file mode 100644
diff --git a/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/bin/avr-ld b/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/bin/avr-ld
new file mode 100755
diff --git a/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/lib/gcc/avr/5.4.0/libgcc.a b/clang/test/Driver/Inputs/basic_avr_tree_opt_local/opt/local/lib/gcc/avr/5.4.0/libgcc.a
new file mode 100644
diff --git a/clang/test/Driver/avr-toolchain.c b/clang/test/Driver/avr-toolchain.c
--- a/clang/test/Driver/avr-toolchain.c
+++ b/clang/test/Driver/avr-toolchain.c
@@ -6,8 +6,11 @@
 // RUN: %clang %s -### -no-canonical-prefixes -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 | FileCheck -check-prefix CC1A %s
 // CC1A: clang{{.*}} "-cc1" "-triple" "avr" {{.*}} "-internal-isystem" {{".*avr/include"}}
 
-// RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 -nostdinc | FileCheck -check-prefix CC1B %s
-// CC1B-NOT: "-internal-isystem" {{".*avr/include"}}
+// RUN: %clang %s -### -no-canonical-prefixes -target avr --sysroot %S/Inputs/basic_avr_tree_opt_local/opt/local 2>&1 | FileCheck -check-prefix CC1B %s
+// CC1B: clang{{.*}} "-cc1" "-triple" "avr" {{.*}} "-internal-isystem" {{".*/opt/local/avr/include"}}
 
-// RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 -nostdlibinc | FileCheck -check-prefix CC1C %s
+// RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 -nostdinc | FileCheck -check-prefix CC1C %s
 // CC1C-NOT: "-internal-isystem" {{".*avr/include"}}
+
+// RUN: %clang %s -### -target avr --sysroot %S/Inputs/basic_avr_tree 2>&1 -nostdlibinc | FileCheck -check-prefix CC1D %s
+// CC1D-NOT: "-internal-isystem" {{".*avr/include"}}