diff --git a/packages/google-devtools-cloudbuild/package.json b/packages/google-devtools-cloudbuild/package.json
index 93b7cc74df7..c449b88805b 100644
--- a/packages/google-devtools-cloudbuild/package.json
+++ b/packages/google-devtools-cloudbuild/package.json
@@ -52,7 +52,7 @@
     "prepare": "npm run compile-protos && npm run compile",
     "pretest": "npm run compile",
     "test": "c8 mocha build/test",
-    "system-test": "c8 mocha --timeout=15000 system-test/*.js",
+    "system-test": "c8 mocha --timeout=15000 system-test/*.js build/system-test/*.js",
     "samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
     "predocs-test": "npm run docs",
     "docs-test": "linkinator docs",
@@ -63,6 +63,6 @@
     "node": ">=8.10.0"
   },
   "dependencies": {
-    "google-gax": "^1.7.5"
+    "google-gax": "^1.14.2"
   }
 }
diff --git a/packages/google-devtools-cloudbuild/synth.metadata b/packages/google-devtools-cloudbuild/synth.metadata
index 0e629b1de41..87b89ec0807 100644
--- a/packages/google-devtools-cloudbuild/synth.metadata
+++ b/packages/google-devtools-cloudbuild/synth.metadata
@@ -1,19 +1,12 @@
 {
-  "updateTime": "2020-02-13T04:36:50.444597Z",
+  "updateTime": "2020-02-29T19:14:13.934361Z",
   "sources": [
-    {
-      "git": {
-        "name": ".",
-        "remote": "git@github.com:googleapis/nodejs-cloudbuild.git",
-        "sha": "7efa0aeeb4ee354fda57b14807f8a3d0f4bab194"
-      }
-    },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "0646bc775203077226c2c34d3e4d50cc4ec53660",
-        "internalRef": "294809380"
+        "sha": "83c6f84035ee0f80eaa44d8b688a010461cc4080",
+        "internalRef": "297918498"
       }
     },
     {
diff --git a/packages/google-devtools-cloudbuild/synth.py b/packages/google-devtools-cloudbuild/synth.py
index f7dd862b279..4dcce43e56f 100644
--- a/packages/google-devtools-cloudbuild/synth.py
+++ b/packages/google-devtools-cloudbuild/synth.py
@@ -27,7 +27,8 @@
   library = gapic.typescript_library(
     'cloudbuild',
     generator_args={
-      "grpc-service-config": "google/devtools/cloudbuild/v1/cloudbuild_grpc_service_config.json"
+      "grpc-service-config": "google/devtools/cloudbuild/v1/cloudbuild_grpc_service_config.json",
+      "package-name": "@google-cloud/cloudbuild"
     },
     proto_path='/google/devtools/cloudbuild/v1',
     version=version)
@@ -39,27 +40,5 @@
 s.copy(templates, excludes=[])
 
 # Node.js specific cleanup
-subprocess.run(['rm', '-rf', './system-test/fixtures'])
 subprocess.run(['npm', 'install'])
 subprocess.run(['npm', 'run', 'fix'])
-
-# Add missing jsdoc annotations:
-s.replace("src/index.js",
-r"""\/\*\*
- \* @namespace google
- \*/""",
-r"""/**
- * @namespace google
- */
-/**
- * @namespace google.rpc
- */
-/**
- * @namespace google.protobuf
- */
-/**
- * @namespace google.longrunning
- */""")
-s.replace("src/index.js",
-r"namespace google.cloud.cloudbuild",
-r"namespace google.devtools.cloudbuild")
diff --git a/packages/google-devtools-cloudbuild/system-test/fixtures/sample/src/index.js b/packages/google-devtools-cloudbuild/system-test/fixtures/sample/src/index.js
new file mode 100644
index 00000000000..5fa8fdb4709
--- /dev/null
+++ b/packages/google-devtools-cloudbuild/system-test/fixtures/sample/src/index.js
@@ -0,0 +1,26 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// ** This file is automatically generated by gapic-generator-typescript. **
+// ** https://github.com/googleapis/gapic-generator-typescript **
+// ** All changes to this file may be overwritten. **
+
+/* eslint-disable node/no-missing-require, no-unused-vars */
+const cloudbuild = require('@google-cloud/cloudbuild');
+
+function main() {
+  const cloudBuildClient = new cloudbuild.CloudBuildClient();
+}
+
+main();
diff --git a/packages/google-devtools-cloudbuild/system-test/fixtures/sample/src/index.ts b/packages/google-devtools-cloudbuild/system-test/fixtures/sample/src/index.ts
new file mode 100644
index 00000000000..4ab3ab35685
--- /dev/null
+++ b/packages/google-devtools-cloudbuild/system-test/fixtures/sample/src/index.ts
@@ -0,0 +1,25 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// ** This file is automatically generated by gapic-generator-typescript. **
+// ** https://github.com/googleapis/gapic-generator-typescript **
+// ** All changes to this file may be overwritten. **
+
+import {CloudBuildClient} from '@google-cloud/cloudbuild';
+
+function main() {
+  const cloudBuildClient = new CloudBuildClient();
+}
+
+main();