diff --git a/tfjs-converter/cloudbuild.yml b/tfjs-converter/cloudbuild.yml
index 21291d8286f..be33a2330ed 100644
--- a/tfjs-converter/cloudbuild.yml
+++ b/tfjs-converter/cloudbuild.yml
@@ -6,13 +6,21 @@ steps:
   id: 'yarn-common'
   args: ['install']
 
+# Build core from master.
+- name: 'node:10'
+  dir: 'tfjs-converter'
+  id: 'build-core'
+  entrypoint: 'yarn'
+  args: ['build-core-ci']
+  waitFor: ['yarn-common']
+
 # Install converter dependencies.
 - name: 'node:10'
   dir: 'tfjs-converter'
   entrypoint: 'yarn'
   id: 'yarn'
   args: ['install']
-  waitFor: ['yarn-common']
+  waitFor: ['build-core']
 
 # Run lint.
 - name: 'node:10'
diff --git a/tfjs-converter/package.json b/tfjs-converter/package.json
index 582185c261b..220712ca108 100644
--- a/tfjs-converter/package.json
+++ b/tfjs-converter/package.json
@@ -15,10 +15,10 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@tensorflow/tfjs-core": "1.5.2"
+    "@tensorflow/tfjs-core": "link:../tfjs-core"
   },
   "devDependencies": {
-    "@tensorflow/tfjs-core": "1.5.2",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
     "@types/deep-equal": "^1.0.1",
     "@types/jasmine": "~2.8.6",
     "@types/long": "~3.0.32",
@@ -55,10 +55,12 @@
   },
   "scripts": {
     "build": "yarn gen-json --test && tsc && copyfiles -f src/data/compiled_api.* dist/src/data/",
+    "build-core": "cd ../tfjs-core && yarn && yarn build",
+    "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
     "build-npm": "./scripts/build-npm.sh",
     "link-local": "yalc link",
     "publish-local": "yarn build-npm && yalc push",
-    "test": "yarn gen-json --test && ts-node run_tests.ts",
+    "test": "yarn build-core && yarn && yarn gen-json --test && ts-node run_tests.ts",
     "test-ci": "ts-node run_tests.ts",
     "test-snippets": "ts-node ./scripts/test_snippets.ts",
     "lint": "tslint -p . -t verbose",
diff --git a/tfjs-converter/yarn.lock b/tfjs-converter/yarn.lock
index bac226939d3..7e49367c2f0 100644
--- a/tfjs-converter/yarn.lock
+++ b/tfjs-converter/yarn.lock
@@ -55,17 +55,9 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@tensorflow/tfjs-core@1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.5.2.tgz#df76752cf7c43987df1548fb69820935bd8215d7"
-  integrity sha512-Rj6l8xf0PxrEKctvX3bvxjqhHLaCBQT0ChvqFK6//HBu8A1/ao4SzeVKpXKNnP9Niax+qV3c9U9VcOwwIkCMag==
-  dependencies:
-    "@types/offscreencanvas" "~2019.3.0"
-    "@types/seedrandom" "2.4.27"
-    "@types/webgl-ext" "0.0.30"
-    "@types/webgl2" "0.0.4"
-    node-fetch "~2.1.2"
-    seedrandom "2.4.3"
+"@tensorflow/tfjs-core@link:../tfjs-core":
+  version "0.0.0"
+  uid ""
 
 "@types/deep-equal@^1.0.1":
   version "1.0.1"