diff --git a/validation-test/IDE/crashers/020-swift-typechecker-validategenericfuncsignature.swift b/validation-test/IDE/crashers/020-swift-typechecker-validategenericfuncsignature.swift
deleted file mode 100644
index fb9d8158853c1..0000000000000
--- a/validation-test/IDE/crashers/020-swift-typechecker-validategenericfuncsignature.swift
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: not --crash %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
-protocol a{struct B<e{let a{protocol a{func a<T:s#^A^#
\ No newline at end of file
diff --git a/validation-test/IDE/crashers/028-swift-typechecker-validategenericsignature.swift b/validation-test/IDE/crashers/028-swift-typechecker-validategenericsignature.swift
deleted file mode 100644
index b0fb33d7fab29..0000000000000
--- a/validation-test/IDE/crashers/028-swift-typechecker-validategenericsignature.swift
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: not --crash %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
-protocol c{struct Q<g{var d{{class B<T:e#^A^#
\ No newline at end of file
diff --git a/validation-test/IDE/crashers/041-swift-archetypebuilder-getgenericsignature.swift b/validation-test/IDE/crashers/041-swift-archetypebuilder-getgenericsignature.swift
deleted file mode 100644
index 0f16abed06556..0000000000000
--- a/validation-test/IDE/crashers/041-swift-archetypebuilder-getgenericsignature.swift
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: not --crash %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
-protocol A{class d<g{var e{enum b<T:a#^A^#
diff --git a/validation-test/IDE/crashers_fixed/020-swift-typechecker-validategenericfuncsignature.swift b/validation-test/IDE/crashers_fixed/020-swift-typechecker-validategenericfuncsignature.swift
new file mode 100644
index 0000000000000..acebd0a06dd4e
--- /dev/null
+++ b/validation-test/IDE/crashers_fixed/020-swift-typechecker-validategenericfuncsignature.swift
@@ -0,0 +1,2 @@
+// RUN: not %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+protocol a{struct B<e{let a{protocol a{func a<T:s#^A^#
diff --git a/validation-test/IDE/crashers_fixed/028-swift-typechecker-validategenericsignature.swift b/validation-test/IDE/crashers_fixed/028-swift-typechecker-validategenericsignature.swift
new file mode 100644
index 0000000000000..ddff352a96a6a
--- /dev/null
+++ b/validation-test/IDE/crashers_fixed/028-swift-typechecker-validategenericsignature.swift
@@ -0,0 +1,2 @@
+// RUN: not %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+protocol c{struct Q<g{var d{{class B<T:e#^A^#
diff --git a/validation-test/IDE/crashers_fixed/041-swift-archetypebuilder-getgenericsignature.swift b/validation-test/IDE/crashers_fixed/041-swift-archetypebuilder-getgenericsignature.swift
new file mode 100644
index 0000000000000..c091fb858b6bf
--- /dev/null
+++ b/validation-test/IDE/crashers_fixed/041-swift-archetypebuilder-getgenericsignature.swift
@@ -0,0 +1,2 @@
+// RUN: not %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
+protocol A{class d<g{var e{enum b<T:a#^A^#