5 files changed, 14 insertions, 4 deletions
diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS
index 979323d3..5eb95271 100644
--- a/test/end-to-end/TARGETS
+++ b/test/end-to-end/TARGETS
@@ -1,5 +1,9 @@
 { "tool-under-test":
   {"type": "install", "files": {"bin/tool-under-test": [".", "just"]}}
+, "mr-tool-under-test":
+  { "type": "install"
+  , "files": {"bin/mr-tool-under-test": ["", "bin/just-mr.py"]}
+  }
 , "TESTS":
   { "type": "install"
   , "tainted": ["test"]
diff --git a/test/end-to-end/remote-execution/TARGETS b/test/end-to-end/remote-execution/TARGETS
index 6d420dd0..0f7b5118 100644
--- a/test/end-to-end/remote-execution/TARGETS
+++ b/test/end-to-end/remote-execution/TARGETS
@@ -2,7 +2,10 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["native-protocol"]
   , "test": ["native-protocol.sh"]
-  , "deps": [["test/end-to-end", "tool-under-test"], ["", "bin/just-mr.py"]]
+  , "deps":
+    [ ["test/end-to-end", "tool-under-test"]
+    , ["test/end-to-end", "mr-tool-under-test"]
+    ]
   }
 , "large-blobs":
   { "type": ["@", "rules", "shell/test", "script"]
diff --git a/test/end-to-end/remote-execution/native-protocol.sh b/test/end-to-end/remote-execution/native-protocol.sh
index fb2b10f0..aea047ad 100644
--- a/test/end-to-end/remote-execution/native-protocol.sh
+++ b/test/end-to-end/remote-execution/native-protocol.sh
@@ -20,7 +20,7 @@ readonly DIRNAME="dir"
 readonly OUT_DIRNAME="${DIRNAME}out"
 readonly GITDIR="${TEST_TMPDIR}/git-root"
 readonly LBRDIR="${TEST_TMPDIR}/local-build-root"
-readonly JUST_MR="${PWD}/bin/just-mr.py"
+readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
 readonly JUST="${PWD}/bin/tool-under-test"
 readonly RESULT="out.txt"
 
diff --git a/test/end-to-end/target-cache/TARGETS b/test/end-to-end/target-cache/TARGETS
index 853335a9..09057dd2 100644
--- a/test/end-to-end/target-cache/TARGETS
+++ b/test/end-to-end/target-cache/TARGETS
@@ -2,7 +2,10 @@
   { "type": ["@", "rules", "shell/test", "script"]
   , "name": ["target-cache-hit"]
   , "test": ["target-cache-hit.sh"]
-  , "deps": [["test/end-to-end", "tool-under-test"], ["", "bin/just-mr.py"]]
+  , "deps":
+    [ ["test/end-to-end", "tool-under-test"]
+    , ["test/end-to-end", "mr-tool-under-test"]
+    ]
   }
 , "artifacts-sync":
   { "type": ["@", "rules", "shell/test", "script"]
diff --git a/test/end-to-end/target-cache/target-cache-hit.sh b/test/end-to-end/target-cache/target-cache-hit.sh
index 25940966..e4776f2f 100644
--- a/test/end-to-end/target-cache/target-cache-hit.sh
+++ b/test/end-to-end/target-cache/target-cache-hit.sh
@@ -17,7 +17,7 @@
 set -eu
 
 readonly JUST="$PWD/bin/tool-under-test"
-readonly JUST_MR="$PWD/bin/just-mr.py"
+readonly JUST_MR="$PWD/bin/mr-tool-under-test"
 readonly LBRDIR="$TEST_TMPDIR/local-build-root"
 readonly TESTDIR="$TEST_TMPDIR/test-root"