diff --git a/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts b/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts
new file mode 100644
index 00000000000..6ce9bf73f5d
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionBuiltInTypes.ts
@@ -0,0 +1,11 @@
+/// <reference path='fourslash.ts'/>
+
+////var n: /*number*/number;
+////var s: /*string*/string;
+////var b: /*boolean*/boolean;
+////var v: /*void*/void;
+
+test.markers().forEach((m, i, a) => {
+    goTo.position(m.position, m.fileName);
+    verify.not.definitionLocationExists();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/goToDefinitionBuiltInValues.ts b/tests/cases/fourslash/goToDefinitionBuiltInValues.ts
new file mode 100644
index 00000000000..7a13c7298c2
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionBuiltInValues.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts'/>
+
+////var u = /*undefined*/undefined;
+////var n = /*null*/null;
+////var a = function() { return /*arguments*/arguments; };
+
+test.markers().forEach((m, i, a) => {
+    goTo.position(m.position, m.fileName);
+    verify.not.definitionLocationExists();
+});
\ No newline at end of file
diff --git a/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts b/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts
index b36492af474..8b7b19dc871 100644
--- a/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts
+++ b/tests/cases/fourslash/goToDefinitionUndefinedSymbols.ts
@@ -1,6 +1,11 @@
 /// <reference path='fourslash.ts' />
 
-////some/*undefined*/Variable;
+////some/*undefinedValue*/Variable;
+////var a: some/*undefinedType*/Type;
+////var x = {}; x.some/*undefinedProperty*/Property;
+////var a: any; a.some/*unkownProperty*/Property;
 
-goTo.marker("undefined");
-verify.not.definitionLocationExists();
+test.markers().forEach((m, i, a) => {
+    goTo.position(m.position, m.fileName);
+    verify.not.definitionLocationExists();
+});