test: Use own installed just and just-mr targets...

...which do not stage also the debug source and header files (while
in debug mode), as this is unnecessary bloat in the tests.

As the tool-under-test and mr-tool-under-test targets should be
used instead of the regular install targets also in the various
extra rules in end-to-end and utils, move their definition in the
outmost test TARGETS file.

25 files changed, 177 insertions, 202 deletions

diff --git a/test/TARGETS b/test/TARGETS
index fb3bf82b..5c529e4c 100644
--- a/test/TARGETS
+++ b/test/TARGETS
@@ -1,4 +1,37 @@
-{ "catch-main":
+{ "tested just":
+  { "type": ["@", "rules", "CC", "install-with-deps"]
+  , "skip-debug-stage": ["yes"]
+  , "targets": [["@", "src", "", "just"]]
+  }
+, "tool-under-test":
+  { "type": "install"
+  , "dirs": [["tested just", "."]]
+  , "files": {"bin/tool-under-test": ["@", "src", "", "just"]}
+  }
+, "tested just-mr":
+  { "type": ["@", "rules", "CC", "install-with-deps"]
+  , "skip-debug-stage": ["yes"]
+  , "targets": [["@", "src", "", "just-mr"]]
+  }
+, "mr-tool-under-test":
+  { "type": "install"
+  , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"]
+  , "dirs":
+    { "type": "if"
+    , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
+    , "then": []
+    , "else": [["tested just-mr", "."]]
+    }
+  , "files":
+    { "bin/mr-tool-under-test":
+      { "type": "if"
+      , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
+      , "then": ["@", "src", "", "bin/just-mr.py"]
+      , "else": ["@", "src", "", "just-mr"]
+      }
+    }
+  }
+, "catch-main":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["catch-main"]
   , "srcs": ["main.cpp"]
diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES
index f6818ba2..32b373c9 100644
--- a/test/end-to-end/RULES
+++ b/test/end-to-end/RULES
@@ -84,7 +84,7 @@
   , "implicit":
     { "runner": ["with_remote_test_runner.py"]
     , "summarizer": [["@", "rules", "shell/test", "summarizer"]]
-    , "just": [["@", "src", "", "installed just"]]
+    , "just": [["", "tool-under-test"]]
     }
   , "imports":
     { "test-result": "test-result"
@@ -323,7 +323,7 @@
   , "implicit":
     { "runner": ["with_serve_test_runner.py"]
     , "summarizer": [["@", "rules", "shell/test", "summarizer"]]
-    , "just": [["@", "src", "", "installed just"]]
+    , "just": [["", "tool-under-test"]]
     }
   , "imports":
     { "test-result": "test-result"
diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS
index 2bb71e8f..be347ae9 100644
--- a/test/end-to-end/TARGETS
+++ b/test/end-to-end/TARGETS
@@ -1,27 +1,4 @@
-{ "tool-under-test":
-  { "type": "install"
-  , "dirs": [[["@", "src", "", "installed just"], "."]]
-  , "files": {"bin/tool-under-test": ["@", "src", "", "just"]}
-  }
-, "mr-tool-under-test":
-  { "type": "install"
-  , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"]
-  , "dirs":
-    { "type": "if"
-    , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
-    , "then": []
-    , "else": [[["@", "src", "", "installed just-mr"], "."]]
-    }
-  , "files":
-    { "bin/mr-tool-under-test":
-      { "type": "if"
-      , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
-      , "then": ["@", "src", "", "bin/just-mr.py"]
-      , "else": ["@", "src", "", "just-mr"]
-      }
-    }
-  }
-, "git-import-under-test":
+{ "git-import-under-test":
   { "type": "install"
   , "files":
     {"bin/git-import-under-test": ["@", "src", "", "bin/just-import-git.py"]}
diff --git a/test/end-to-end/actions/TARGETS b/test/end-to-end/actions/TARGETS
index 25a05ea5..38ef7a84 100644
--- a/test/end-to-end/actions/TARGETS
+++ b/test/end-to-end/actions/TARGETS
@@ -3,7 +3,7 @@
   , "name": ["equality"]
   , "test": ["action-equality.sh"]
   , "keep": ["graph.json"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "equality-timeout":
   { "type": ["@", "rules", "shell/test", "script"]
@@ -17,7 +17,7 @@
     , "generic/graph-1.json"
     , "generic/graph-2.json"
     ]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "equality-properties":
   { "type": ["@", "rules", "shell/test", "script"]
@@ -31,32 +31,32 @@
     , "generic/graph-empty.json"
     , "generic/graph-set.json"
     ]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "trees":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["trees"]
   , "test": ["nested-trees.sh"]
   , "keep": ["blobs.json", "trees.json", "out/index.txt"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "conflicts":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["conflicts"]
   , "test": ["conflicts.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "incomplete-retry":
   { "type": ["end-to-end", "with remote"]
   , "name": ["incompete-retry"]
   , "test": ["incomplete-retry.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "error-reporting":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["error-reporting"]
   , "test": ["error-reporting.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/build-fails/TARGETS b/test/end-to-end/build-fails/TARGETS
index 991c1770..6aa6ada1 100644
--- a/test/end-to-end/build-fails/TARGETS
+++ b/test/end-to-end/build-fails/TARGETS
@@ -2,7 +2,7 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["single_fail_dep"]
   , "test": ["single_fail_dep.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "TESTS":
   {"type": "install", "tainted": ["test"], "deps": ["single_fail_dep"]}
diff --git a/test/end-to-end/built-in-rules/TARGETS b/test/end-to-end/built-in-rules/TARGETS
index fd1882cf..47a2a811 100644
--- a/test/end-to-end/built-in-rules/TARGETS
+++ b/test/end-to-end/built-in-rules/TARGETS
@@ -2,39 +2,38 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["generic_out_dirs"]
   , "test": ["generic_out_dirs.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "generic_sh":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["generic_sh"]
   , "test": ["generic_sh.sh"]
   , "keep": ["null.json", "empty.json", "custom.json"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "filegen_config":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["filegen_config"]
   , "test": ["filegen_config.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "tree":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["tree"]
   , "test": ["tree.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "symlink_config":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["symlink_config"]
   , "test": ["symlink_config.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "export_counting":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["export_counting"]
   , "test": ["export_counting.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/cli/TARGETS b/test/end-to-end/cli/TARGETS
index b0c97bc8..03f1db49 100644
--- a/test/end-to-end/cli/TARGETS
+++ b/test/end-to-end/cli/TARGETS
@@ -2,67 +2,63 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["defaults"]
   , "test": ["defaults.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "pwd":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["pwd"]
   , "test": ["pwd.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "install":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["install"]
   , "test": ["install.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "analyse":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["analyse"]
   , "test": ["analyse.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "build -P":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["build-P"]
   , "test": ["build-p.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "git cas -P":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["git-cas-P"]
   , "test": ["git-cas-p.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "just-mr reporting":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["just-mr-reporting"]
   , "test": ["just-mr-reporting.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "keep": ["log/warning.txt"]
   }
 , "install --archive":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["install-archive"]
   , "test": ["install-archive.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "keep": ["src.tar", "reconstructed.tar", "fromstdout.tar"]
   }
 , "conflict report":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["conflict-report"]
   , "test": ["conflict-report.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "log limit":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["log-limit"]
   , "test": ["log-limit.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/execution-service/TARGETS b/test/end-to-end/execution-service/TARGETS
index 2d4b63b7..76b8b37c 100644
--- a/test/end-to-end/execution-service/TARGETS
+++ b/test/end-to-end/execution-service/TARGETS
@@ -2,13 +2,13 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["simple_build"]
   , "test": ["simple_build.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "tree_inputs":
   { "type": ["end-to-end", "with remote"]
   , "name": ["tree_inputs"]
   , "test": ["tree_inputs.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/gc/TARGETS b/test/end-to-end/gc/TARGETS
index 91a9cd98..34fc869a 100644
--- a/test/end-to-end/gc/TARGETS
+++ b/test/end-to-end/gc/TARGETS
@@ -2,28 +2,25 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["basic"]
   , "test": ["basic.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "compactification":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["compactification"]
   , "test": ["compactification.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "export":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["export"]
   , "test": ["export.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "tc-deps":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["tc-deps"]
   , "test": ["tc-deps.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/generated-binary/TARGETS b/test/end-to-end/generated-binary/TARGETS
index f488090e..fa5aa9bc 100644
--- a/test/end-to-end/generated-binary/TARGETS
+++ b/test/end-to-end/generated-binary/TARGETS
@@ -3,7 +3,7 @@
   , "name": ["shell"]
   , "test": ["shell-script.sh"]
   , "keep": ["out/out.txt"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "compile rules":
   {"type": "install", "files": {"RULES": "data/RULES.compiled"}}
@@ -12,7 +12,7 @@
   , "name": ["compiled"]
   , "test": ["compiled.sh"]
   , "keep": ["graph.json", "out/out.txt"]
-  , "deps": [["end-to-end", "tool-under-test"], "compile rules"]
+  , "deps": [["", "tool-under-test"], "compile rules"]
   }
 , "TESTS":
   {"type": "install", "tainted": ["test"], "deps": ["shell", "compiled"]}
diff --git a/test/end-to-end/git-import/TARGETS b/test/end-to-end/git-import/TARGETS
index b8715443..d932908f 100644
--- a/test/end-to-end/git-import/TARGETS
+++ b/test/end-to-end/git-import/TARGETS
@@ -4,8 +4,8 @@
   , "test": ["chained-import.sh"]
   , "deps":
     [ ["end-to-end", "git-import-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     ]
   }
 , "check-action-equality":
@@ -20,8 +20,8 @@
   , "deps":
     [ ["end-to-end", "git-import-under-test"]
     , ["end-to-end", "deduplicate-tool-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "check-action-equality"
     ]
   , "keep":
@@ -33,8 +33,8 @@
   , "test": ["annotations.sh"]
   , "deps":
     [ ["end-to-end", "git-import-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     ]
   , "keep": ["repos.json"]
   }
diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS
index a1bb74b6..6875fa0c 100644
--- a/test/end-to-end/just-mr/TARGETS
+++ b/test/end-to-end/just-mr/TARGETS
@@ -2,20 +2,19 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["cas-independent"]
   , "test": ["cas-independent.sh"]
-  , "deps": [["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"]]
   }
 , "fetch":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["fetch"]
   , "test": ["fetch.sh"]
-  , "deps": [["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"]]
   }
 , "fetch-gc":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["fetch-gc"]
   , "test": ["fetch-gc.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "create_test_archives":
   { "type": ["@", "rules", "CC", "binary"]
@@ -40,7 +39,7 @@
   , "deps":
     [ "create_test_archives"
     , ["utils", "test_utils_install"]
-    , ["end-to-end", "mr-tool-under-test"]
+    , ["", "mr-tool-under-test"]
     ]
   }
 , "just_mr_mirrors":
@@ -51,77 +50,70 @@
     [ "create_test_archives"
     , ["utils", "test_utils_install"]
     , ["utils", "null server"]
-    , ["end-to-end", "mr-tool-under-test"]
+    , ["", "mr-tool-under-test"]
     ]
   }
 , "git-tree-verbosity":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["git-tree-verbosity"]
   , "test": ["verbosity.sh"]
-  , "deps": [["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"]]
   }
 , "defaults":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["default-values"]
   , "test": ["defaults.sh"]
-  , "deps": [["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"]]
   }
 , "install-roots":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["install-roots"]
   , "test": ["install-roots.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "install-roots-symlinks":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["install-roots-symlinks"]
   , "test": ["install-roots-symlinks.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "fetch-remote":
   { "type": ["end-to-end", "with remote"]
   , "name": ["fetch-remote"]
   , "test": ["fetch-remote.sh"]
-  , "deps": [["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"]]
   }
 , "fetch-remote-git-tree":
   { "type": ["end-to-end", "with remote"]
   , "name": ["fetch-remote-git-tree"]
   , "test": ["fetch-remote-git-tree.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "absent-roots":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["absent-roots"]
   , "test": ["absent-roots.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "fetch-absent":
   { "type": ["end-to-end", "with serve"]
   , "name": ["fetch-absent"]
   , "test": ["fetch-absent.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": ["fetch-absent (data)"]
   }
 , "fetch-absent-git-tree":
   { "type": ["end-to-end", "with serve"]
   , "name": ["fetch-absent-git-tree"]
   , "test": ["fetch-absent-git-tree.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": ["fetch-absent (data)"]
   }
 , "absent-config":
   { "type": ["end-to-end", "with serve"]
   , "name": ["absent-config"]
   , "test": ["absent-config.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": ["fetch-absent (data)"]
   }
 , "fetch-absent-archives":
@@ -129,8 +121,8 @@
   , "name": ["fetch-absent-archives"]
   , "test": ["fetch-absent-archives.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "fetch-absent (data)"
     ]
   , "repos": ["fetch-absent (data)"]
@@ -140,8 +132,8 @@
   , "name": ["fetch-absent-archives-symlinks"]
   , "test": ["fetch-absent-archives-symlinks.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "fetch-absent-with-symlinks (data)"
     ]
   , "repos": ["fetch-absent-with-symlinks (data)"]
@@ -151,8 +143,8 @@
   , "name": ["fetch-absent-distdir-archive"]
   , "test": ["fetch-absent-distdir-archive.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "fetch-absent (data)"
     ]
   , "repos": ["fetch-absent (data)"]
@@ -179,30 +171,27 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["git-tree-git-tree-env"]
   , "test": ["git-tree-env.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "git-env":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["git-env"]
   , "test": ["git-env.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "foreign-file":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["foreign-file"]
   , "test": ["foreign-file.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "reporting-verbosity":
   { "type": ["end-to-end", "with remote"]
   , "name": ["reporting-verbosity"]
   , "test": ["reporting-verbosity.sh"]
   , "deps":
-    [ ["end-to-end", "tool-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
+    [ ["", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
     , "fetch-absent (data)"
     ]
   }
@@ -211,8 +200,8 @@
   , "name": ["stay-local"]
   , "test": ["stay-local.sh"]
   , "deps":
-    [ ["end-to-end", "tool-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
+    [ ["", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
     , "fetch-absent (data)"
     , ["utils", "null server"]
     ]
diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS
index 45dc50d5..1cd3b1a7 100644
--- a/test/end-to-end/remote-execution/TARGETS
+++ b/test/end-to-end/remote-execution/TARGETS
@@ -2,38 +2,37 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["native-protocol"]
   , "test": ["native-protocol.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "large-blobs":
   { "type": ["end-to-end", "with remote"]
   , "name": ["large-blobs"]
   , "test": ["large-blobs.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "upload-test":
   { "type": ["end-to-end", "with remote"]
   , "name": ["upload-test"]
   , "test": ["upload-test.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "install":
   { "type": ["end-to-end", "with remote"]
   , "name": ["install"]
   , "test": ["install.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "execute":
   { "type": ["end-to-end", "with remote"]
   , "name": ["execute"]
   , "test": ["execute.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "install-cas":
   { "type": ["end-to-end", "with remote"]
   , "name": ["install-cas"]
   , "test": ["install-cas.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   , "keep":
     [ "out/stdout/remote"
     , "out/stdout/remote-raw"
@@ -45,13 +44,13 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["dispatch"]
   , "test": ["dispatch.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "split-splice (raw)":
   { "type": ["end-to-end", "with remote"]
   , "name": ["split-splice"]
   , "test": ["split-splice.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "split-splice":
   { "type": "configure"
@@ -71,8 +70,7 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["add-to-cas"]
   , "test": ["add-to-cas.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index 18941f83..46e9e0dc 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -2,8 +2,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-remote-build"]
   , "test": ["serve_target_remote_build.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos":
     [ "serve-target-remote-build (repo)"
     , "serve-target-remote-build (rule)"
@@ -15,8 +14,8 @@
   , "name": ["serve-target-failed-build"]
   , "test": ["serve_target_failed_build.sh"]
   , "deps":
-    [ ["end-to-end", "tool-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
+    [ ["", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
     , "serve-tree (archive)"
     , "data/targets/TARGETS"
     , "data/rules/RULES"
@@ -56,28 +55,25 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-cache-hit"]
   , "test": ["serve_target_cache_hit.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "serve-start-execute":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["serve-start-execute"]
   , "test": ["serve_start_execute.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "serve-start-execute-sharding":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["serve-start-execute-sharding"]
   , "test": ["serve_start_execute_sharding.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "serve-export-deps":
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-export-deps"]
   , "test": ["serve_export_deps.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "serve-tree (data)":
   {"type": "install", "dirs": [["serve-target-remote-build (repo)", "repo"]]}
@@ -92,8 +88,8 @@
   , "name": ["serve-tree"]
   , "test": ["serve-tree.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree (archive)"
     , "data/targets/TARGETS.tree"
     ]
@@ -108,16 +104,14 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-target-remote-build-dispatch"]
   , "test": ["serve_target_remote_build_dispatch.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos": ["serve-target-remote-build-dispatch (data)"]
   }
 , "serve-query-target-cache-value":
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-query-target-cache-value"]
   , "test": ["serve_query_target_cache_value.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   }
 , "describe (data)":
   { "type": "install"
@@ -130,8 +124,8 @@
   , "name": ["describe"]
   , "test": ["describe.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "describe (locally installed)"
     ]
   , "repos": ["describe (data)"]
@@ -146,8 +140,8 @@
   , "name": ["failure-report"]
   , "test": ["failure-report.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "describe (locally installed)"
     ]
   , "repos": ["failure-report (data)"]
@@ -166,8 +160,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["serve-many-targets"]
   , "test": ["serve_many_targets.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos":
     ["serve-many-targets (data)", "serve-many-targets (data in module)"]
   }
@@ -175,8 +168,7 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["deduplication-of-serve-requests"]
   , "test": ["deduplication_of_serve_requests.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   , "repos": ["serve-many-targets (data)"]
   }
 , "TESTS (unconfigured)":
diff --git a/test/end-to-end/serve-service/serve-archive-root/TARGETS b/test/end-to-end/serve-service/serve-archive-root/TARGETS
index f5753214..a133956b 100644
--- a/test/end-to-end/serve-service/serve-archive-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-archive-root/TARGETS
@@ -17,8 +17,8 @@
   , "name": ["unresolved-present"]
   , "test": ["unresolved-present.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   , "repos": [["end-to-end/serve-service", "serve-tree (archive)"]]
@@ -28,8 +28,8 @@
   , "name": ["unresolved-absent"]
   , "test": ["unresolved-absent.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   , "repos": [["end-to-end/serve-service", "serve-tree (archive)"]]
@@ -39,8 +39,8 @@
   , "name": ["unresolved-absent-known"]
   , "test": ["unresolved-absent-known.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   , "repos": [["end-to-end/serve-service", "serve-tree (archive)"]]
@@ -50,8 +50,8 @@
   , "name": ["unresolved-absent-known-upload"]
   , "test": ["unresolved-absent-known-upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
@@ -60,8 +60,8 @@
   , "name": ["resolved-present"]
   , "test": ["resolved-present.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
@@ -71,8 +71,8 @@
   , "name": ["resolved-absent"]
   , "test": ["resolved-absent.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
@@ -82,8 +82,8 @@
   , "name": ["resolved-absent-known"]
   , "test": ["resolved-absent-known.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   , "repos": ["serve-tree-syms (archive)"]
@@ -93,8 +93,8 @@
   , "name": ["resolved-absent-known-upload"]
   , "test": ["resolved-absent-known-upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-tree-syms (archive)"
     ]
   }
diff --git a/test/end-to-end/serve-service/serve-distdir-root/TARGETS b/test/end-to-end/serve-service/serve-distdir-root/TARGETS
index 1240f53b..8cff743a 100644
--- a/test/end-to-end/serve-service/serve-distdir-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-distdir-root/TARGETS
@@ -16,8 +16,8 @@
   , "name": ["present"]
   , "test": ["present.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-distdir (data)"
     ]
   , "repos": ["serve-distdir (data)"]
@@ -27,8 +27,8 @@
   , "name": ["absent"]
   , "test": ["absent.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-distdir (data)"
     ]
   , "repos": ["serve-distdir (data)"]
@@ -38,8 +38,8 @@
   , "name": ["upload"]
   , "test": ["upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , "serve-distdir (data)"
     ]
   }
@@ -48,8 +48,8 @@
   , "name": ["foreign-file"]
   , "test": ["foreign-file.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["TREE", null, "foreign-file-data"]
     ]
   , "repos": [["TREE", null, "foreign-file-data"]]
diff --git a/test/end-to-end/serve-service/serve-file-root/TARGETS b/test/end-to-end/serve-service/serve-file-root/TARGETS
index b4d686e5..1c51a3e7 100644
--- a/test/end-to-end/serve-service/serve-file-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-file-root/TARGETS
@@ -3,8 +3,8 @@
   , "name": ["upload"]
   , "test": ["upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
diff --git a/test/end-to-end/serve-service/serve-git-root/TARGETS b/test/end-to-end/serve-service/serve-git-root/TARGETS
index db390833..d8d6b9db 100644
--- a/test/end-to-end/serve-service/serve-git-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-git-root/TARGETS
@@ -2,16 +2,14 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["present"]
   , "test": ["present.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "absent":
   { "type": ["end-to-end", "with serve"]
   , "name": ["absent"]
   , "test": ["absent.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "absent-upload":
@@ -19,8 +17,8 @@
   , "name": ["absent-upload"]
   , "test": ["absent-upload.sh"]
   , "deps":
-    [ ["end-to-end", "mr-tool-under-test"]
-    , ["end-to-end", "tool-under-test"]
+    [ ["", "mr-tool-under-test"]
+    , ["", "tool-under-test"]
     , ["end-to-end/serve-service", "serve-tree (archive)"]
     ]
   }
diff --git a/test/end-to-end/serve-service/serve-git-tree-root/TARGETS b/test/end-to-end/serve-service/serve-git-tree-root/TARGETS
index 664c08c4..143aa7a4 100644
--- a/test/end-to-end/serve-service/serve-git-tree-root/TARGETS
+++ b/test/end-to-end/serve-service/serve-git-tree-root/TARGETS
@@ -2,16 +2,14 @@
   { "type": ["end-to-end", "with serve"]
   , "name": ["present"]
   , "test": ["present.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "absent":
   { "type": ["end-to-end", "with serve"]
   , "name": ["absent"]
   , "test": ["absent.sh"]
-  , "deps":
-    [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]]
+  , "deps": [["", "mr-tool-under-test"], ["", "tool-under-test"]]
   , "repos": [["end-to-end/serve-service", "serve-tree (data)"]]
   }
 , "TESTS":
diff --git a/test/end-to-end/symlinks/TARGETS b/test/end-to-end/symlinks/TARGETS
index 12add451..f70f2029 100644
--- a/test/end-to-end/symlinks/TARGETS
+++ b/test/end-to-end/symlinks/TARGETS
@@ -2,7 +2,7 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["stage-links"]
   , "test": ["stage-links.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "TESTS": {"type": "install", "tainted": ["test"], "deps": ["stage-links"]}
 }
diff --git a/test/end-to-end/target-cache/TARGETS b/test/end-to-end/target-cache/TARGETS
index 5a2b0412..36f8a59b 100644
--- a/test/end-to-end/target-cache/TARGETS
+++ b/test/end-to-end/target-cache/TARGETS
@@ -2,16 +2,15 @@
   { "type": ["end-to-end", "with remote"]
   , "name": ["target-cache-hit"]
   , "test": ["target-cache-hit.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "artifacts-sync":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["artifacts-sync"]
   , "test": ["artifacts-sync.sh"]
   , "deps":
-    [ ["end-to-end", "tool-under-test"]
-    , ["end-to-end", "mr-tool-under-test"]
+    [ ["", "tool-under-test"]
+    , ["", "mr-tool-under-test"]
     , ["./", "data", "greetlib"]
     , ["./", "data", "pydicts"]
     , "bootstrap-src-staged"
@@ -21,8 +20,7 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["export-extern"]
   , "test": ["export-extern.sh"]
-  , "deps":
-    [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]]
+  , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]]
   }
 , "bootstrap-src-staged":
   {"type": "install", "dirs": [[["@", "src", "", "bootstrap-src"], "src"]]}
diff --git a/test/end-to-end/target-tests/TARGETS b/test/end-to-end/target-tests/TARGETS
index 67d40542..b4a9b210 100644
--- a/test/end-to-end/target-tests/TARGETS
+++ b/test/end-to-end/target-tests/TARGETS
@@ -2,43 +2,43 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["upwards"]
   , "test": ["upwards.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "repository naming":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["repo_names"]
   , "test": ["repo_names.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "resolution of built-in rules":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["built-in-resolution"]
   , "test": ["built-in-resolution.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "glob expansion":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["glob"]
   , "test": ["glob.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "configure target name":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["configure-target"]
   , "test": ["configure-target.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "configure variables":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["configure-vars"]
   , "test": ["configure-vars.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "tree inputs":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["tree-inputs"]
   , "test": ["tree-inputs.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/end-to-end/user-errors/TARGETS b/test/end-to-end/user-errors/TARGETS
index 4a3c4e90..e52e7c5a 100644
--- a/test/end-to-end/user-errors/TARGETS
+++ b/test/end-to-end/user-errors/TARGETS
@@ -2,13 +2,13 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["flat-stage"]
   , "test": ["flat-stage.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "json-errors":
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["json-errors"]
   , "test": ["json-errors.sh"]
-  , "deps": [["end-to-end", "tool-under-test"]]
+  , "deps": [["", "tool-under-test"]]
   }
 , "TESTS":
   { "type": "install"
diff --git a/test/utils/remote_execution/RULES b/test/utils/remote_execution/RULES
index 059f707a..290b04d2 100644
--- a/test/utils/remote_execution/RULES
+++ b/test/utils/remote_execution/RULES
@@ -29,7 +29,7 @@
   , "implicit":
     { "defaults": [["@", "rules", "CC", "defaults"]]
     , "runner": ["test_runner.py"]
-    , "just": [["@", "src", "", "installed just"]]
+    , "just": [["", "tool-under-test"]]
     }
   , "field_doc":
     { "name":
diff --git a/test/utils/serve_service/RULES b/test/utils/serve_service/RULES
index 4766a055..5b492b6a 100644
--- a/test/utils/serve_service/RULES
+++ b/test/utils/serve_service/RULES
@@ -30,7 +30,7 @@
   , "implicit":
     { "defaults": [["@", "rules", "CC", "defaults"]]
     , "runner": ["test_runner.py"]
-    , "just": [["@", "src", "", "installed just"]]
+    , "just": [["", "tool-under-test"]]
     }
   , "field_doc":
     { "name":