diff --git a/scripts/package_dependencies.json b/scripts/package_dependencies.json
index 104b0980b37..2b275b7dc59 100644
--- a/scripts/package_dependencies.json
+++ b/scripts/package_dependencies.json
@@ -1,5 +1,6 @@
 
 {
   "tfjs-core": [],
-  "tfjs-converter": ["tfjs-core"]
+  "tfjs-converter": ["tfjs-core"],
+  "tfjs-layers": ["tfjs-core"]
 }
diff --git a/tfjs-layers/cloudbuild.yml b/tfjs-layers/cloudbuild.yml
index 07d33046212..68d154ec7be 100644
--- a/tfjs-layers/cloudbuild.yml
+++ b/tfjs-layers/cloudbuild.yml
@@ -5,13 +5,21 @@ steps:
   id: 'yarn-common'
   args: ['install']
 
+# Build core from master.
+- name: 'node:10'
+  dir: 'tfjs-layers'
+  id: 'build-core'
+  entrypoint: 'yarn'
+  args: ['build-core-ci']
+  waitFor: ['yarn-common']
+
 # Install layers dependencies
 - name: 'node:10'
   dir: 'tfjs-layers'
   entrypoint: 'yarn'
   id: 'yarn'
   args: ['prep']
-  waitFor: ['yarn-common']
+  waitFor: ['build-core']
 
 - name: 'node:10'
   dir: 'tfjs-layers'
diff --git a/tfjs-layers/integration_tests/tfjs2keras/package.json b/tfjs-layers/integration_tests/tfjs2keras/package.json
index 478de104628..c7df33ef896 100644
--- a/tfjs-layers/integration_tests/tfjs2keras/package.json
+++ b/tfjs-layers/integration_tests/tfjs2keras/package.json
@@ -5,9 +5,9 @@
   "private": false,
   "license": "Apache-2.0 AND MIT",
   "devDependencies": {
-    "@tensorflow/tfjs-core": "1.3.0",
-    "@tensorflow/tfjs-layers": "1.3.0",
-    "@tensorflow/tfjs-node": "1.3.0",
+    "@tensorflow/tfjs-core": "1.6.0",
+    "@tensorflow/tfjs-layers": "1.6.0",
+    "@tensorflow/tfjs-node": "1.6.0",
     "clang-format": "~1.2.2"
   },
   "scripts": {
diff --git a/tfjs-layers/package.json b/tfjs-layers/package.json
index 8b55fd186ad..45ba8885e27 100644
--- a/tfjs-layers/package.json
+++ b/tfjs-layers/package.json
@@ -12,7 +12,7 @@
   "unpkg": "dist/tf-layers.min.js",
   "miniprogram": "dist/miniprogram",
   "devDependencies": {
-    "@tensorflow/tfjs-core": "1.6.0",
+    "@tensorflow/tfjs-core": "link:../tfjs-core",
     "@types/jasmine": "~2.5.53",
     "clang-format": "~1.2.2",
     "http-server": "~0.10.0",
@@ -39,11 +39,13 @@
   "scripts": {
     "prep": "yarn install && yarn build",
     "build": "tsc",
+    "build-core": "cd ../tfjs-core && yarn && yarn build",
+    "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci",
     "build-npm": "./scripts/build-npm.sh",
     "format": "./tools/clang_format_ts.sh",
     "link-local": "yalc link",
     "publish-local": "yarn build-npm && yalc push",
-    "test": "karma start",
+    "test": "yarn build-core && yarn && karma start",
     "tfjs2keras": "yarn tfjs2keras-js && yarn tfjs2keras-py --stable && yarn tfjs2keras-py --stable --tfkeras && yarn tfjs2keras-py --dev --tfkeras",
     "tfjs2keras-js": "./scripts/tfjs2keras-js.sh",
     "tfjs2keras-py": "./scripts/tfjs2keras-py.sh",
@@ -53,6 +55,6 @@
     "lint": "tslint -p . -t verbose"
   },
   "peerDependencies": {
-    "@tensorflow/tfjs-core": "1.6.0"
+    "@tensorflow/tfjs-core": "link:../tfjs-core"
   }
 }
diff --git a/tfjs-layers/yarn.lock b/tfjs-layers/yarn.lock
index 5c499e051ee..ca7da050eae 100644
--- a/tfjs-layers/yarn.lock
+++ b/tfjs-layers/yarn.lock
@@ -2,17 +2,9 @@
 # yarn lockfile v1
 
 
-"@tensorflow/tfjs-core@1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@tensorflow/tfjs-core/-/tfjs-core-1.6.0.tgz#8a871de73995e0efc7ea5660df018402c788d285"
-  integrity sha512-b98jn1pjRuEDVNN6/ZQMFhyYV27ZIsG9CcHSMXq1ohX6ALQQB3mwgrMeC2TEVXFl6/L2vOD8W+txuBRGKHnvpg==
-  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/estree@0.0.38":
   version "0.0.38"