diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
index fbdb179e6c8..0d1664c7f59 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
@@ -56,7 +56,18 @@ module schema {
         return undefined;
     }
 }
-
+
+
+module schema {
+    export class T {
+        get createValidator9(): <T>(data: T) => T {
+            return undefined;
+        }
+        
+        set createValidator10(v: <T>(data: T) => T) {
+        }
+    }
+}
 
 //// [isDeclarationVisibleNodeKinds.js]
 // Function types
@@ -123,6 +134,28 @@ var schema;
     }
     _schema.createValidator8 = createValidator8;
 })(schema || (schema = {}));
+var schema;
+(function (schema) {
+    var T = (function () {
+        function T() {
+        }
+        Object.defineProperty(T.prototype, "createValidator9", {
+            get: function () {
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(T.prototype, "createValidator10", {
+            set: function (v) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return T;
+    })();
+    schema.T = T;
+})(schema || (schema = {}));
 
 
 //// [isDeclarationVisibleNodeKinds.d.ts]
@@ -158,3 +191,9 @@ declare module schema {
         <T>(data: T): T;
     }>;
 }
+declare module schema {
+    class T {
+        createValidator9: <T>(data: T) => T;
+        createValidator10: <T>(data: T) => T;
+    }
+}
diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
index 70b0fa09ebd..b3fe8d684b7 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
@@ -138,3 +138,31 @@ module schema {
     }
 }
 
+
+module schema {
+>schema : typeof schema
+
+    export class T {
+>T : T
+
+        get createValidator9(): <T>(data: T) => T {
+>createValidator9 : <T>(data: T) => T
+>T : T
+>data : T
+>T : T
+>T : T
+
+            return undefined;
+>undefined : undefined
+        }
+        
+        set createValidator10(v: <T>(data: T) => T) {
+>createValidator10 : <T>(data: T) => T
+>v : <T>(data: T) => T
+>T : T
+>data : T
+>T : T
+>T : T
+        }
+    }
+}
diff --git a/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts b/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts
index 34950be8943..0434c40ee6a 100644
--- a/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts
+++ b/tests/cases/compiler/isDeclarationVisibleNodeKinds.ts
@@ -1,4 +1,5 @@
 // @declaration: true
+// @target: es5
 
 // Function types
 module schema {
@@ -56,3 +57,15 @@ module schema {
         return undefined;
     }
 }
+
+
+module schema {
+    export class T {
+        get createValidator9(): <T>(data: T) => T {
+            return undefined;
+        }
+        
+        set createValidator10(v: <T>(data: T) => T) {
+        }
+    }
+}
\ No newline at end of file