diff --git a/templates/typescript_gapic/_util.njk b/templates/typescript_gapic/_util.njk
index ae9c977e0..1200d4057 100644
--- a/templates/typescript_gapic/_util.njk
+++ b/templates/typescript_gapic/_util.njk
@@ -42,7 +42,7 @@ limitations under the License.
 {%- macro printCommentsForMethod(method) -%}
 {%- set lines = method.comments -%}
 {% for line in lines %}
- *{{ line | safe}}
+ *{{ line.replaceAll('*/', '* /') | safe}}
 {%- endfor %}
 {%- endmacro -%}
 
diff --git a/typescript/test/test_application/test_ts.ts b/typescript/test/test_application/test_ts.ts
index e30c880e6..427b92b49 100644
--- a/typescript/test/test_application/test_ts.ts
+++ b/typescript/test/test_application/test_ts.ts
@@ -54,7 +54,7 @@ const TS_TEST_APPLICATION = path.join(
 describe('TestApplication', () => {
   describe('Test application for ts users', () => {
     it('npm install showcase', async function() {
-      this.timeout(30000);
+      this.timeout(60000);
       // copy protos to generated client library and copy test application to local.
       if (!fs.existsSync(path.join(SHOWCASE_LIB, 'protos'))) {
         fs.copySync(PROTOS, path.join(SHOWCASE_LIB, 'protos'));