diff --git a/executable_semantics/testdata/generic_class/fail_args_mismatch.carbon b/executable_semantics/testdata/generic_class/fail_args_mismatch.carbon
new file mode 100644
index 000000000000..86706cf08ff8
--- /dev/null
+++ b/executable_semantics/testdata/generic_class/fail_args_mismatch.carbon
@@ -0,0 +1,29 @@
+// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
+// Exceptions. See /LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// RUN: %{not} %{executable_semantics} %s 2>&1 | \
+// RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes=false --dump-input=always -v %s
+// AUTOUPDATE: %{executable_semantics} %s
+// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/generic_class/fail_args_mismatch.carbon:14: type error in call: '(Type, Type)' is not implicitly convertible to '(Type)'
+
+package ExecutableSemanticsTest api;
+
+class Point(T:! Type) {
+  // Point(T, T) does not match class declaration
+  fn Origin(zero: T) -> Point(T, T) {
+    return {.x = zero, .y = zero};
+  }
+
+  fn GetX[me: Point(T, T)]() -> T {
+    return me.x;
+  }
+
+  var x: T;
+  var y: T;
+}
+
+fn Main() -> i32 {
+  var p: Point(i32) = Point(i32).Origin(0);
+  return p.GetX();
+}