diff --git a/clang/test/Modules/pr21217.cpp b/clang/test/Modules/pr21217.cpp
new file mode 100644
index 000000000000..a439c97e9577
--- /dev/null
+++ b/clang/test/Modules/pr21217.cpp
@@ -0,0 +1,3 @@
+// RUN: not %clang_cc1 -fmodules -fmodule-map-file=does-not-exist.modulemap -verify %s 2>&1 | FileCheck %s
+
+// CHECK: module map file 'does-not-exist.modulemap' not found