5 files changed, 7 insertions, 8 deletions
diff --git a/test/end-to-end/EXPRESSIONS b/test/end-to-end/EXPRESSIONS
index 3348d460..5ef8b01d 100644
--- a/test/end-to-end/EXPRESSIONS
+++ b/test/end-to-end/EXPRESSIONS
@@ -12,6 +12,7 @@
   , "imports":
     { "artifacts_list": ["@", "rules", "", "field_artifacts_list"]
     , "runfiles_list": ["@", "rules", "", "field_runfiles_list"]
+    , "artifacts": ["@", "rules", "", "field_artifacts"]
     , "stage": ["@", "rules", "", "stage_singleton_field"]
     }
   , "expression":
@@ -21,8 +22,7 @@
       , ["location", "runner"]
       , ["runner", {"type": "CALL_EXPRESSION", "name": "stage"}]
       , ["fieldname", "just"]
-      , ["location", "just"]
-      , ["just", {"type": "CALL_EXPRESSION", "name": "stage"}]
+      , ["just", {"type": "CALL_EXPRESSION", "name": "artifacts"}]
       , ["fieldname", "deps"]
       , [ "deps"
         , { "type": "TREE"
diff --git a/test/end-to-end/RULES b/test/end-to-end/RULES
index 37434719..d98275b3 100644
--- a/test/end-to-end/RULES
+++ b/test/end-to-end/RULES
@@ -69,7 +69,7 @@
   , "implicit":
     { "runner": ["with_remote_test_runner.py"]
     , "summarizer": [["@", "rules", "shell/test", "test_summary.py"]]
-    , "just": [["@", "src", "", "just"]]
+    , "just": [["@", "src", "", "installed just"]]
     }
   , "imports":
     { "test-result": "test-result"
diff --git a/test/end-to-end/with_remote_test_runner.py b/test/end-to-end/with_remote_test_runner.py
index c685b2c5..c34821ca 100755
--- a/test/end-to-end/with_remote_test_runner.py
+++ b/test/end-to-end/with_remote_test_runner.py
@@ -70,7 +70,7 @@ if not custom_remote:
 
 
     remote_cmd = [
-        "./just", "execute",
+        "./bin/just", "execute",
         "--info-file", REMOTE_INFO,
         "--local-build-root", REMOTE_LBR,
         "--log-limit", "6", "--plain-log",
diff --git a/test/utils/remote_execution/RULES b/test/utils/remote_execution/RULES
index 603ba233..af8d440f 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", "", "just"]]
+    , "just": [["@", "src", "", "installed just"]]
     }
   , "field_doc":
     { "name":
@@ -168,8 +168,7 @@
       , ["location", "runner"]
       , ["runner", {"type": "CALL_EXPRESSION", "name": "stage"}]
       , ["fieldname", "just"]
-      , ["location", "just"]
-      , ["just", {"type": "CALL_EXPRESSION", "name": "stage"}]
+      , ["just", {"type": "CALL_EXPRESSION", "name": "artifacts"}]
       , [ "compatible-remote"
         , { "type": "singleton_map"
           , "key": "compatible-remote.json"
diff --git a/test/utils/remote_execution/test_runner.py b/test/utils/remote_execution/test_runner.py
index c54acd3f..5295efa3 100755
--- a/test/utils/remote_execution/test_runner.py
+++ b/test/utils/remote_execution/test_runner.py
@@ -57,7 +57,7 @@ if os.path.exists(REMOTE_INFO):
     os.remove(REMOTE_INFO)
 
 remote_cmd = [
-    "./just", "execute",
+    "./bin/just", "execute",
     "--info-file", REMOTE_INFO,
     "--local-build-root", REMOTE_LBR,
     "--log-limit", "6", "--plain-log",