diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts
index f18e73b31ef..d75d606cc73 100644
--- a/tests/cases/compiler/spreadInvalidArgumentType.ts
+++ b/tests/cases/compiler/spreadInvalidArgumentType.ts
@@ -27,18 +27,18 @@ function f<T extends { b: string }>(p1: T, p2: T[]) {
 
     var e: E;
 
-    var o1 = { ...p1 };   // Error, generic type paramterre
-    var o2 = { ...p2 };   // OK
-    var o3 = { ...t };   // Error, generic type paramter
-    var o4 = { ...i };   // Error, index access
+    var o1 = { ...p1 };  // OK, generic type paramterre
+    var o2 = { ...p2 };  // OK
+    var o3 = { ...t };   // OK, generic type paramter
+    var o4 = { ...i };   // OK, index access
     var o5 = { ...k };   // Error, index
-    var o6 = { ...mapped_generic }; // Error, generic mapped object type
+    var o6 = { ...mapped_generic }; // OK, generic mapped object type
     var o7 = { ...mapped };  // OK, non-generic mapped type
 
-    var o8 = { ...union_generic };  // Error, union with generic type parameter
+    var o8 = { ...union_generic };  // OK, union with generic type parameter
     var o9 = { ...union_primitive };  // Error, union with generic type parameter
 
-    var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+    var o10 = { ...intersection_generic };  // OK, intersection with generic type parameter
     var o11 = { ...intersection_primitive };  // Error, intersection with generic type parameter
 
     var o12 = { ...num };  // Error
diff --git a/tests/cases/conformance/types/spread/objectSpread.ts b/tests/cases/conformance/types/spread/objectSpread.ts
index 810a8f3d496..5917bdf6dcf 100644
--- a/tests/cases/conformance/types/spread/objectSpread.ts
+++ b/tests/cases/conformance/types/spread/objectSpread.ts
@@ -122,6 +122,20 @@ let shortCutted: { a: number, b: string } = { ...o, a }
 let spreadNonPrimitive = { ...<object>{}};
 
 // generic spreads
+
+function f<T, U>(t: T, u: U) {
+    return { ...t, ...u, id: 'id' };
+}
+
+let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
+    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
+let overlap: { id: string, a: number, b: string } =
+    f({ a: 1 }, { a: 2, b: 'extra' })
+let overlapConflict: { id:string, a: string } =
+    f({ a: 1 }, { a: 'mismatch' })
+let overwriteId: { id: string, a: number, c: number, d: string } =
+    f({ a: 1, id: true }, { c: 1, d: 'no' })
+
 function genericSpread<T, U>(t: T, u: U, v: T | U, w: T | { s: string }, obj: { x: number }) {
     let x01 = { ...t };
     let x02 = { ...t, ...t };
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 789016762da..f31d62e2faf 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -57,19 +57,3 @@ spreadC.m(); // error 'm' is not in '{ ... c }'
 let obj: object = { a: 123 };
 let spreadObj = { ...obj };
 spreadObj.a; // error 'a' is not in {}
-
-// generics
-function f<T, U>(t: T, u: U) {
-    return { ...t, ...u, id: 'id' };
-}
-function override<U>(initial: U, override: U): U {
-    return { ...initial, ...override };
-}
-let exclusive: { id: string, a: number, b: string, c: string, d: boolean } =
-    f({ a: 1, b: 'yes' }, { c: 'no', d: false })
-let overlap: { id: string, a: number, b: string } =
-    f({ a: 1 }, { a: 2, b: 'extra' })
-let overlapConflict: { id:string, a: string } =
-    f({ a: 1 }, { a: 'mismatch' })
-let overwriteId: { id: string, a: number, c: number, d: string } =
-    f({ a: 1, id: true }, { c: 1, d: 'no' })