diff --git a/WORKSPACE b/WORKSPACE
index 1abaa7acae..54f412826f 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -117,8 +117,8 @@ yarn_install(
         ".json",
         ".proto",
     ],
-    package_json = "//internal/e2e/fine_grained_deps:package.json",
-    yarn_lock = "//internal/e2e/fine_grained_deps:yarn.lock",
+    package_json = "//internal/e2e/fine_grained_deps:yarn/package.json",
+    yarn_lock = "//internal/e2e/fine_grained_deps:yarn/yarn.lock",
 )
 
 npm_install(
@@ -130,8 +130,8 @@ npm_install(
         ".json",
         ".proto",
     ],
-    package_json = "//internal/e2e/fine_grained_deps:package.json",
-    package_lock_json = "//internal/e2e/fine_grained_deps:package-lock.json",
+    package_json = "//internal/e2e/fine_grained_deps:npm/package.json",
+    package_lock_json = "//internal/e2e/fine_grained_deps:npm/package-lock.json",
 )
 
 yarn_install(
diff --git a/internal/e2e/fine_grained_deps/package-lock.json b/internal/e2e/fine_grained_deps/npm/package-lock.json
similarity index 97%
rename from internal/e2e/fine_grained_deps/package-lock.json
rename to internal/e2e/fine_grained_deps/npm/package-lock.json
index 6660f2c5b2..8ebb3674df 100644
--- a/internal/e2e/fine_grained_deps/package-lock.json
+++ b/internal/e2e/fine_grained_deps/npm/package-lock.json
@@ -2,36 +2,6 @@
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
-    "@bazel/bazel": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/@bazel/bazel/-/bazel-0.19.0.tgz",
-      "integrity": "sha512-9ldIQzy2P1gDmh7joXkzoFeK8kYfNNIfSd8vjrmGMJDZY+RaHvjLIQPms+pDr0SHurb6j9v4UkAgT99uesCxgQ==",
-      "requires": {
-        "@bazel/bazel-darwin_x64": "0.19.0",
-        "@bazel/bazel-linux_x64": "0.19.0",
-        "@bazel/bazel-win32_x64": "0.19.0"
-      },
-      "dependencies": {
-        "@bazel/bazel-darwin_x64": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.19.0.tgz",
-          "integrity": "sha512-ht2IuKUaigL4qRpNuPBPT93gVtX/Hr3+YWNbtYXNl81w5WqFcF8XejZ4CYmKQou330kM8oFFs+qSqr69uJV4VQ==",
-          "optional": true
-        },
-        "@bazel/bazel-linux_x64": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.19.0.tgz",
-          "integrity": "sha512-tXA9/HZg9TT6yY8OyHIwqF1pCu6LWcvfKuesWDTayxxqZTbYlvKKI3+CJXCeFHmkMrmq9cQWYk3RJ7En37s0kQ==",
-          "optional": true
-        },
-        "@bazel/bazel-win32_x64": {
-          "version": "0.19.0",
-          "resolved": "https://registry.npmjs.org/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.19.0.tgz",
-          "integrity": "sha512-fRCNl7Bmn8PXKRUIlMIddAhgBECc1IVqNIg8S3+n+FEAi53oPkqFkwCLOJD8X8PekhRcimkdT79qp1Oazae17w==",
-          "optional": true
-        }
-      }
-    },
     "@gregmagolan/test-a": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/@gregmagolan/test-a/-/test-a-0.0.4.tgz",
diff --git a/internal/e2e/fine_grained_deps/package.json b/internal/e2e/fine_grained_deps/npm/package.json
similarity index 93%
rename from internal/e2e/fine_grained_deps/package.json
rename to internal/e2e/fine_grained_deps/npm/package.json
index 34ef311115..bceb41f0c7 100644
--- a/internal/e2e/fine_grained_deps/package.json
+++ b/internal/e2e/fine_grained_deps/npm/package.json
@@ -7,7 +7,6 @@
   "dependencies": {
     "@gregmagolan/test-a": "0.0.4",
     "@gregmagolan/test-b": "0.0.2",
-    "@bazel/bazel": "0.23.0",
     "ajv": "5.5.2",
     "chokidar": "2.0.4",
     "http-server": "github:alexeagle/http-server#97205e945b69091606ed83aa0c8489e9ce65d282",
diff --git a/internal/e2e/fine_grained_deps/yarn/package.json b/internal/e2e/fine_grained_deps/yarn/package.json
new file mode 100644
index 0000000000..bceb41f0c7
--- /dev/null
+++ b/internal/e2e/fine_grained_deps/yarn/package.json
@@ -0,0 +1,16 @@
+{
+  "description": "runtime dependencies fine_grained_deps e2e test",
+  "devDependencies": {
+    "jasmine": "3.3.0",
+    "typescript": "3.0.3"
+  },
+  "dependencies": {
+    "@gregmagolan/test-a": "0.0.4",
+    "@gregmagolan/test-b": "0.0.2",
+    "ajv": "5.5.2",
+    "chokidar": "2.0.4",
+    "http-server": "github:alexeagle/http-server#97205e945b69091606ed83aa0c8489e9ce65d282",
+    "klaw": "1.3.1",
+    "rxjs": "6.3.3"
+  }
+}
diff --git a/internal/e2e/fine_grained_deps/yarn.lock b/internal/e2e/fine_grained_deps/yarn/yarn.lock
similarity index 97%
rename from internal/e2e/fine_grained_deps/yarn.lock
rename to internal/e2e/fine_grained_deps/yarn/yarn.lock
index 14f591265c..f3dfd80326 100644
--- a/internal/e2e/fine_grained_deps/yarn.lock
+++ b/internal/e2e/fine_grained_deps/yarn/yarn.lock
@@ -2,30 +2,6 @@
 # yarn lockfile v1
 
 
-"@bazel/bazel-darwin_x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.19.0.tgz#333420555a0a0fd2b548ef0fbe4961bf1712585d"
-  integrity sha512-ht2IuKUaigL4qRpNuPBPT93gVtX/Hr3+YWNbtYXNl81w5WqFcF8XejZ4CYmKQou330kM8oFFs+qSqr69uJV4VQ==
-
-"@bazel/bazel-linux_x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.19.0.tgz#313b5d0cd5f443fa506f95cc69d2230fc5fcb0f2"
-  integrity sha512-tXA9/HZg9TT6yY8OyHIwqF1pCu6LWcvfKuesWDTayxxqZTbYlvKKI3+CJXCeFHmkMrmq9cQWYk3RJ7En37s0kQ==
-
-"@bazel/bazel-win32_x64@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.19.0.tgz#5c540535c703bc925caf95c4e1e19957bf0d79b3"
-  integrity sha512-fRCNl7Bmn8PXKRUIlMIddAhgBECc1IVqNIg8S3+n+FEAi53oPkqFkwCLOJD8X8PekhRcimkdT79qp1Oazae17w==
-
-"@bazel/bazel@0.19.0":
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.19.0.tgz#b719bf07fe9bd97990481ed638f08b280433be70"
-  integrity sha512-9ldIQzy2P1gDmh7joXkzoFeK8kYfNNIfSd8vjrmGMJDZY+RaHvjLIQPms+pDr0SHurb6j9v4UkAgT99uesCxgQ==
-  optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.19.0"
-    "@bazel/bazel-linux_x64" "0.19.0"
-    "@bazel/bazel-win32_x64" "0.19.0"
-
 "@gregmagolan/test-a@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@gregmagolan/test-a/-/test-a-0.0.1.tgz#c90ebc0676f13b34400da8d1e55ffe5aa76655b4"