diff --git a/tests/cases/fourslash/genericFunctionReturnType.ts b/tests/cases/fourslash/genericFunctionReturnType.ts
index 9cb41a30ffb07..35c566e209078 100644
--- a/tests/cases/fourslash/genericFunctionReturnType.ts
+++ b/tests/cases/fourslash/genericFunctionReturnType.ts
@@ -8,8 +8,7 @@
 ////var /*2*/r = foo(/*1*/1, "");
 ////var /*4*/r2 = r(/*3*/"");
 
-// TODO: GH##23631
-// verify.signatureHelp({ marker: "1", text: "foo(x: number, y: string): (a: string) => number" });
+verify.signatureHelp({ marker: "1", text: "foo(x: number, y: string): (a: string) => number" });
 
 verify.quickInfoAt("2", "var r: (a: string) => number");
 
diff --git a/tests/cases/fourslash/genericFunctionSignatureHelp3.ts b/tests/cases/fourslash/genericFunctionSignatureHelp3.ts
index cc763f489cc1f..d2180219c2aa6 100644
--- a/tests/cases/fourslash/genericFunctionSignatureHelp3.ts
+++ b/tests/cases/fourslash/genericFunctionSignatureHelp3.ts
@@ -18,17 +18,14 @@
 
 verify.signatureHelp(
     { marker: "1", text: "foo1(x: number, callback: (y1: {}) => number): void" },
-    // TODO: GH#23631
-    // { marker: "2", text: "foo2(x: number, callback: (y2: {}) => number): void" },
+    { marker: "2", text: "foo2(x: number, callback: (y2: {}) => number): void" },
     { marker: "3", text: "callback(y3: {}): number" },
-    // TODO: GH#23631
-    // { marker: "4", text: "foo4(x: number, callback: (y4: string) => number): void" },
+    { marker: "4", text: "foo4(x: number, callback: (y4: string) => number): void" },
     { marker: "5", text: "callback(y5: string): number" },
 );
 
 goTo.marker('6');
-// TODO: GH#23631
-// verify.signatureHelp({ text: "foo6(x: number, callback: (y6: {}) => number): void" });
+verify.signatureHelp({ text: "foo6(x: number, callback: (y6: {}) => number): void" });
 edit.insert('string>(null,null);'); // need to make this line parse so we can get reasonable LS answers to later tests
 
 verify.signatureHelp({ marker: "7", text: "foo7(x: number, callback: (y7: {}) => number): void" });
diff --git a/tests/cases/fourslash/genericParameterHelp.ts b/tests/cases/fourslash/genericParameterHelp.ts
index 320c159203cdf..698ace8a4d87d 100644
--- a/tests/cases/fourslash/genericParameterHelp.ts
+++ b/tests/cases/fourslash/genericParameterHelp.ts
@@ -14,8 +14,6 @@
 ////testFunction<, ,/*5*/>(null, null, null);
 
 verify.signatureHelp(
-    // TODO: GH#23631
-    /*
     {
         marker: "1",
         text: "testFunction<T extends IFoo, U, M extends IFoo>(a: T, b: U, c: M): M",
@@ -24,7 +22,6 @@ verify.signatureHelp(
         parameterSpan: "T extends IFoo",
     },
     { marker: "2", parameterName: "U", parameterSpan: "U" },
-    */
     { marker: "3", parameterName: "a", parameterSpan: "a: any" },
     { marker: "4", parameterName: "M", parameterSpan: "M extends IFoo" },
     { marker: "5", parameterName: "M", parameterSpan: "M extends IFoo" },
diff --git a/tests/cases/fourslash/genericParameterHelpConstructorCalls.ts b/tests/cases/fourslash/genericParameterHelpConstructorCalls.ts
index 73ae1b91755d3..4c4ca62f99cc5 100644
--- a/tests/cases/fourslash/genericParameterHelpConstructorCalls.ts
+++ b/tests/cases/fourslash/genericParameterHelpConstructorCalls.ts
@@ -14,8 +14,6 @@
 ////new testClass<IFoo,/*constructor5*/IFoo,IFoo>(null, null, null)
 
 verify.signatureHelp(
-    // TODO: GH#23631
-    /*
     {
         marker: "constructor1",
         text: "testClass<T extends IFoo, U, M extends IFoo>(a: T, b: U, c: M): testClass<T, U, M>",
@@ -27,8 +25,7 @@ verify.signatureHelp(
         parameterName: "U",
         parameterSpan: "U",
     },
-    */
-   { marker: "constructor3", parameterName: "T", parameterSpan: "T extends IFoo" },
-   { marker: "constructor4", parameterName: "M", parameterSpan: "M extends IFoo" },
-   { marker: "constructor5", parameterName: "U", parameterSpan: "U" },
+    { marker: "constructor3", parameterName: "T", parameterSpan: "T extends IFoo" },
+    { marker: "constructor4", parameterName: "M", parameterSpan: "M extends IFoo" },
+    { marker: "constructor5", parameterName: "U", parameterSpan: "U" },
 );
diff --git a/tests/cases/fourslash/genericParameterHelpTypeReferences.ts b/tests/cases/fourslash/genericParameterHelpTypeReferences.ts
index 33d3d85d5658b..5a477d23e56ac 100644
--- a/tests/cases/fourslash/genericParameterHelpTypeReferences.ts
+++ b/tests/cases/fourslash/genericParameterHelpTypeReferences.ts
@@ -12,7 +12,7 @@
 ////class Bar<T> extends testClass</*type3*/
 ////var x : testClass<,, /*type4*/any>;
 
-// TODO: GH#23631
+// TODO: GH#26699
 
 if (false) {
     verify.signatureHelp(
diff --git a/tests/cases/fourslash/staticGenericOverloads1.ts b/tests/cases/fourslash/staticGenericOverloads1.ts
index e67b9df8d2d41..7b15e6e2a3ed6 100644
--- a/tests/cases/fourslash/staticGenericOverloads1.ts
+++ b/tests/cases/fourslash/staticGenericOverloads1.ts
@@ -13,11 +13,8 @@
 
 verify.signatureHelp({ marker: "", overloadsCount: 2 });
 edit.insert('a');
-verify.signatureHelp({ overloadsCount: 2 });
-// TODO: GH#23631
-// verify.signatureHelp({ text: "B(v: A<number>): A<number>" });
+verify.signatureHelp({ overloadsCount: 2, text: "B(v: A<number>): A<number>" });
 edit.insert('); A.B(');
 verify.signatureHelp({ overloadsCount: 2, text: "B(v: A<{}>): A<{}>" });
 edit.insert('a');
-// TODO: GH#23631
-// verify.signatureHelp({ text: "B(v: A<number>): A<number>" });
+verify.signatureHelp({ overloadsCount: 2, text: "B(v: A<number>): A<number>" });