diff --git a/tests/cases/conformance/jsdoc/checkJsdocParamTag1.ts b/tests/cases/conformance/jsdoc/checkJsdocParamTag1.ts
new file mode 100644
index 00000000000..1586a10472c
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/checkJsdocParamTag1.ts
@@ -0,0 +1,14 @@
+// @allowJS: true
+// @suppressOutputPathCheck: true
+
+// @filename: 0.js
+// @ts-check
+/**
+ * @param {number=} n
+ * @param {string} [s]
+ */
+function foo(n, s) {}
+
+foo();
+foo(1);
+foo(1, "hi");
\ No newline at end of file
diff --git a/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts b/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts
new file mode 100644
index 00000000000..fde7c3fa0f4
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts
@@ -0,0 +1,25 @@
+// @allowJs: true
+// @out: dummy.js
+
+// @filename: returns.js
+// @ts-check
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+    return "hello";
+}
+
+/**
+ * @returns {string=} This comment is not currently exposed
+ */
+function f1() {
+    return "hello world";
+}
+
+/**
+ * @returns {string|number} This comment is not currently exposed
+ */
+function f2() {
+    return 5 || "hello";
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts b/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts
new file mode 100644
index 00000000000..02b7fbeacef
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts
@@ -0,0 +1,18 @@
+// @allowJs: true
+// @out: dummy.js
+
+// @filename: returns.js
+// @ts-check
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+    return 5;
+}
+
+/**
+ * @returns {string | number} This comment is not currently exposed
+ */
+function f1() {
+    return 5 || true;
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/salsa/jsDocTypes2.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag1.ts
similarity index 72%
rename from tests/cases/conformance/salsa/jsDocTypes2.ts
rename to tests/cases/conformance/jsdoc/checkJsdocTypeTag1.ts
index 612804b91d7..fe3ea76cfc1 100644
--- a/tests/cases/conformance/salsa/jsDocTypes2.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag1.ts
@@ -3,8 +3,15 @@
 
 // @filename: 0.js
 // @ts-check
+/** @type {String} */
+var S = "hello world";
+
+/** @type {number} */
+var n = 10;
+
 /** @type {*} */
 var anyT = 2;
+anyT = "hello";
 
 /** @type {?} */
 var anyT1 = 2;
diff --git a/tests/cases/conformance/salsa/jsDocTypes3.ts b/tests/cases/conformance/jsdoc/checkJsdocTypeTag2.ts
similarity index 57%
rename from tests/cases/conformance/salsa/jsDocTypes3.ts
rename to tests/cases/conformance/jsdoc/checkJsdocTypeTag2.ts
index bf207bca869..a7dffdb90a7 100644
--- a/tests/cases/conformance/salsa/jsDocTypes3.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocTypeTag2.ts
@@ -3,6 +3,11 @@
 
 // @filename: 0.js
 // @ts-check
+/** @type {String} */
+var S = true;
+
+/** @type {number} */
+var n = "hello";
 
 /** @type {function (number)} */
 const x1 = (a) => a + 1;
@@ -13,4 +18,8 @@ const x2 = (a) => a + 1;
 
 /** @type {string} */
 var a;
-a = x2(0);
\ No newline at end of file
+a = x2(0);
+
+/** @type {function (number): number} */
+const x2 = (a) => a.concat("hi");
+x2(0);
\ No newline at end of file
diff --git a/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts b/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts
new file mode 100644
index 00000000000..a425322a749
--- /dev/null
+++ b/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts
@@ -0,0 +1,23 @@
+// @allowJs: true
+// @filename: returns.js
+// @out: dummy.js
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+    return 5;
+}
+
+/**
+ * @returns {string=} This comment is not currently exposed
+ */
+function f1() {
+    return 5;
+}
+
+/**
+ * @returns {string|number} This comment is not currently exposed
+ */
+function f2() {
+    return 5 || "hello";
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/salsa/jsDocTypes.ts b/tests/cases/conformance/jsdoc/jsdocTypeTag.ts
similarity index 87%
rename from tests/cases/conformance/salsa/jsDocTypes.ts
rename to tests/cases/conformance/jsdoc/jsdocTypeTag.ts
index 9a13c533d0a..d566c61e185 100644
--- a/tests/cases/conformance/salsa/jsDocTypes.ts
+++ b/tests/cases/conformance/jsdoc/jsdocTypeTag.ts
@@ -57,7 +57,8 @@ var nullable;
 /** @type {Object} */
 var Obj;
 
-
+/** @type {Function} */
+var Func;
 
 // @filename: b.ts
 var S: string;
@@ -78,3 +79,4 @@ var P: Promise<any>;
 var p: Promise<any>;
 var nullable: number | null;
 var Obj: any;
+var Func: Function;
diff --git a/tests/cases/conformance/jsdoc/returns.ts b/tests/cases/conformance/jsdoc/returns.ts
deleted file mode 100644
index 72cb4a6cb67..00000000000
--- a/tests/cases/conformance/jsdoc/returns.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// @allowJs: true
-// @filename: returns.js
-// @out: dummy.js
-/**
- * @returns {string} This comment is not currently exposed
- */
-function f() {
-    return "";
-}