diff --git a/tests/baselines/reference/nonPrimitiveInGeneric.errors.txt b/tests/baselines/reference/nonPrimitiveInGeneric.errors.txt
index ab8786c37bc..04d4ee4a1a7 100644
--- a/tests/baselines/reference/nonPrimitiveInGeneric.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveInGeneric.errors.txt
@@ -4,9 +4,10 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(14,7): error
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(15,7): error TS2345: Argument of type 'string' is not assignable to parameter of type 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(21,8): error TS2344: Type 'number' does not satisfy the constraint 'object'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(22,8): error TS2344: Type 'string' does not satisfy the constraint 'object'.
+tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(26,14): error TS2344: Type 'number' does not satisfy the constraint 'object'.
 
 
-==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts (6 errors) ====
+==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts (7 errors) ====
     function generic<T>(t: T) {}
     var a = {};
     var b = "42";
@@ -41,4 +42,19 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(22,8): error
     bound2<string>(); // expect error
            ~~~~~~
 !!! error TS2344: Type 'string' does not satisfy the constraint 'object'.
+    
+    interface Proxy<T extends object> {}
+    
+    var x: Proxy<number>; // error
+                 ~~~~~~
+!!! error TS2344: Type 'number' does not satisfy the constraint 'object'.
+    var y: Proxy<null>; // ok
+    var z: Proxy<undefined> ; // ok
+    
+    
+    interface Blah {
+      foo: number;
+    }
+    
+    var u: Proxy<Blah>; // ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveInGeneric.js b/tests/baselines/reference/nonPrimitiveInGeneric.js
index c2e19dde1e4..b7080e149b4 100644
--- a/tests/baselines/reference/nonPrimitiveInGeneric.js
+++ b/tests/baselines/reference/nonPrimitiveInGeneric.js
@@ -21,6 +21,19 @@ bound2<{}>();
 bound2<Object>();
 bound2<number>(); // expect error
 bound2<string>(); // expect error
+
+interface Proxy<T extends object> {}
+
+var x: Proxy<number>; // error
+var y: Proxy<null>; // ok
+var z: Proxy<undefined> ; // ok
+
+
+interface Blah {
+  foo: number;
+}
+
+var u: Proxy<Blah>; // ok
 
 
 //// [nonPrimitiveInGeneric.js]
@@ -41,3 +54,7 @@ bound2();
 bound2();
 bound2(); // expect error
 bound2(); // expect error
+var x; // error
+var y; // ok
+var z; // ok
+var u; // ok
diff --git a/tests/baselines/reference/nonPrimitiveStrictNull.errors.txt b/tests/baselines/reference/nonPrimitiveStrictNull.errors.txt
index cf09994888b..de6fbfcf698 100644
--- a/tests/baselines/reference/nonPrimitiveStrictNull.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveStrictNull.errors.txt
@@ -21,9 +21,12 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(41,5): erro
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(45,5): error TS2532: Object is possibly 'undefined'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(45,7): error TS2339: Property 'toString' does not exist on type 'never'.
 tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(47,5): error TS2531: Object is possibly 'null'.
+tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(52,14): error TS2344: Type 'number' does not satisfy the constraint 'object'.
+tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(53,14): error TS2344: Type 'null' does not satisfy the constraint 'object'.
+tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(54,14): error TS2344: Type 'undefined' does not satisfy the constraint 'object'.
 
 
-==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts (19 errors) ====
+==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts (22 errors) ====
     
     var a: object
     declare var b: object | null
@@ -114,4 +117,22 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts(47,5): erro
         ~
 !!! error TS2531: Object is possibly 'null'.
     }
+    
+    interface Proxy<T extends object> {}
+    
+    var x: Proxy<number>; // error
+                 ~~~~~~
+!!! error TS2344: Type 'number' does not satisfy the constraint 'object'.
+    var y: Proxy<null>; // error
+                 ~~~~
+!!! error TS2344: Type 'null' does not satisfy the constraint 'object'.
+    var z: Proxy<undefined>; // error
+                 ~~~~~~~~~
+!!! error TS2344: Type 'undefined' does not satisfy the constraint 'object'.
+    
+    interface Blah {
+      foo: number;
+    }
+    
+    var u: Proxy<Blah>; // ok
     
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveStrictNull.js b/tests/baselines/reference/nonPrimitiveStrictNull.js
index c91097de960..754ca8cac7d 100644
--- a/tests/baselines/reference/nonPrimitiveStrictNull.js
+++ b/tests/baselines/reference/nonPrimitiveStrictNull.js
@@ -47,6 +47,18 @@ if (typeof d === 'undefined') {
 } else {
     d.toString(); // error, object | null
 }
+
+interface Proxy<T extends object> {}
+
+var x: Proxy<number>; // error
+var y: Proxy<null>; // error
+var z: Proxy<undefined>; // error
+
+interface Blah {
+  foo: number;
+}
+
+var u: Proxy<Blah>; // ok
 
 
 //// [nonPrimitiveStrictNull.js]
@@ -91,3 +103,7 @@ if (typeof d === 'undefined') {
 else {
     d.toString(); // error, object | null
 }
+var x; // error
+var y; // error
+var z; // error
+var u; // ok
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts
index 0de4771a5ef..a19271a59d3 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts
@@ -20,3 +20,16 @@ bound2<{}>();
 bound2<Object>();
 bound2<number>(); // expect error
 bound2<string>(); // expect error
+
+interface Proxy<T extends object> {}
+
+var x: Proxy<number>; // error
+var y: Proxy<null>; // ok
+var z: Proxy<undefined> ; // ok
+
+
+interface Blah {
+  foo: number;
+}
+
+var u: Proxy<Blah>; // ok
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts
index 78f2d5ff7ba..3c2b9646c7e 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveStrictNull.ts
@@ -47,3 +47,15 @@ if (typeof d === 'undefined') {
 } else {
     d.toString(); // error, object | null
 }
+
+interface Proxy<T extends object> {}
+
+var x: Proxy<number>; // error
+var y: Proxy<null>; // error
+var z: Proxy<undefined>; // error
+
+interface Blah {
+  foo: number;
+}
+
+var u: Proxy<Blah>; // ok