diff --git a/src/main/resources/data/computercraft/lua/rom/programs/alias.lua b/src/main/resources/data/computercraft/lua/rom/programs/alias.lua
index 79ebedc1f..c3471a723 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/alias.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/alias.lua
@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs > 2 then
-    print("Usage: alias <alias> <program>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <alias> <program>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/cd.lua b/src/main/resources/data/computercraft/lua/rom/programs/cd.lua
index d1a3e86c1..f127ea88b 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/cd.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/cd.lua
@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: cd <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/command/exec.lua b/src/main/resources/data/computercraft/lua/rom/programs/command/exec.lua
index 67c9446f9..1591b579d 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/command/exec.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/command/exec.lua
@@ -4,7 +4,8 @@ if not commands then
     return
 end
 if #tArgs == 0 then
-    printError("Usage: exec <command>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    printError("Usage: " .. programName .. " <command>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/copy.lua b/src/main/resources/data/computercraft/lua/rom/programs/copy.lua
index 49d58a0b9..0977d3f8f 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/copy.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/copy.lua
@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 2 then
-    print("Usage: cp <source> <destination>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <source> <destination>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/delete.lua b/src/main/resources/data/computercraft/lua/rom/programs/delete.lua
index 620cdd629..1d071619c 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/delete.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/delete.lua
@@ -1,7 +1,8 @@
 local args = table.pack(...)
 
 if args.n < 1 then
-    print("Usage: rm <paths>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <paths>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/edit.lua b/src/main/resources/data/computercraft/lua/rom/programs/edit.lua
index 007f37a24..8f0af9356 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/edit.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/edit.lua
@@ -1,7 +1,8 @@
 -- Get file to edit
 local tArgs = { ... }
 if #tArgs == 0 then
-    print("Usage: edit <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/eject.lua b/src/main/resources/data/computercraft/lua/rom/programs/eject.lua
index b15e2f20f..3deb9c2a2 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/eject.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/eject.lua
@@ -1,7 +1,8 @@
 -- Get arguments
 local tArgs = { ... }
 if #tArgs == 0 then
-    print("Usage: eject <drive>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <drive>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua b/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua
index b7c44526a..cb9de4153 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua
@@ -34,7 +34,8 @@ end
 -- Determines if the file exists, and can be edited on this computer
 local tArgs = { ... }
 if #tArgs == 0 then
-    print("Usage: paint <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 local sPath = shell.resolve(tArgs[1])
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/fun/dj.lua b/src/main/resources/data/computercraft/lua/rom/programs/fun/dj.lua
index 322b4a887..48b4aa06c 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/fun/dj.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/fun/dj.lua
@@ -1,10 +1,11 @@
 local tArgs = { ... }
 
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("dj play")
-    print("dj play <drive>")
-    print("dj stop")
+    print(programName .. " play")
+    print(programName .. " play <drive>")
+    print(programName .. " stop")
 end
 
 if #tArgs > 2 then
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/gps.lua b/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
index c0194443b..3e0590e9b 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/gps.lua
@@ -1,8 +1,9 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("gps host")
-    print("gps host <x> <y> <z>")
-    print("gps locate")
+    print(programName .. " host")
+    print(programName .. " host <x> <y> <z>")
+    print(programName .. " locate")
 end
 
 local tArgs = { ... }
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/http/pastebin.lua b/src/main/resources/data/computercraft/lua/rom/programs/http/pastebin.lua
index 15ad89f36..807ef603f 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/http/pastebin.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/http/pastebin.lua
@@ -1,8 +1,9 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("pastebin put <filename>")
-    print("pastebin get <code> <filename>")
-    print("pastebin run <code> <arguments>")
+    print(programName .. " put <filename>")
+    print(programName .. " get <code> <filename>")
+    print(programName .. " run <code> <arguments>")
 end
 
 local tArgs = { ... }
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/http/wget.lua b/src/main/resources/data/computercraft/lua/rom/programs/http/wget.lua
index 7b5c7654e..ac5fc4fc0 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/http/wget.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/http/wget.lua
@@ -1,7 +1,8 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usage:")
-    print("wget <url> [filename]")
-    print("wget run <url>")
+    print(programName .. " <url> [filename]")
+    print(programName .. " run <url>")
 end
 
 local tArgs = { ... }
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/label.lua b/src/main/resources/data/computercraft/lua/rom/programs/label.lua
index f857dac5c..68f228c60 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/label.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/label.lua
@@ -1,11 +1,12 @@
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("label get")
-    print("label get <drive>")
-    print("label set <text>")
-    print("label set <drive> <text>")
-    print("label clear")
-    print("label clear <drive>")
+    print(programName .. " get")
+    print(programName .. " get <drive>")
+    print(programName .. " set <text>")
+    print(programName .. " set <drive> <text>")
+    print(programName .. " clear")
+    print(programName .. " clear <drive>")
 end
 
 local function checkDrive(sDrive)
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/mkdir.lua b/src/main/resources/data/computercraft/lua/rom/programs/mkdir.lua
index bbdd08002..4e1b8ac10 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/mkdir.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/mkdir.lua
@@ -1,7 +1,8 @@
 local tArgs = { ... }
 
 if #tArgs < 1 then
-    print("Usage: mkdir <paths>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <paths>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/monitor.lua b/src/main/resources/data/computercraft/lua/rom/programs/monitor.lua
index 01c9d7949..e97558357 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/monitor.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/monitor.lua
@@ -1,5 +1,6 @@
 local function printUsage()
-    print("Usage: monitor <name> <program> <arguments>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <name> <program> <arguments>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/move.lua b/src/main/resources/data/computercraft/lua/rom/programs/move.lua
index 254592200..3f68236d0 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/move.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/move.lua
@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 2 then
-    print("Usage: mv <source> <destination>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <source> <destination>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/rednet/chat.lua b/src/main/resources/data/computercraft/lua/rom/programs/rednet/chat.lua
index 1bf5582b2..6585d0675 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/rednet/chat.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/rednet/chat.lua
@@ -1,9 +1,10 @@
 local tArgs = { ... }
 
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("chat host <hostname>")
-    print("chat join <hostname> <nickname>")
+    print(programName .. " host <hostname>")
+    print(programName .. " join <hostname> <nickname>")
 end
 
 local sOpenedModem = nil
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/redstone.lua b/src/main/resources/data/computercraft/lua/rom/programs/redstone.lua
index 65d6c5e1f..7c3165c1c 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/redstone.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/redstone.lua
@@ -1,11 +1,12 @@
 local tArgs = { ... }
 
 local function printUsage()
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
     print("Usages:")
-    print("redstone probe")
-    print("redstone set <side> <value>")
-    print("redstone set <side> <color> <value>")
-    print("redstone pulse <side> <count> <period>")
+    print(programName .. " probe")
+    print(programName .. " set <side> <value>")
+    print(programName .. " set <side> <color> <value>")
+    print(programName .. " pulse <side> <count> <period>")
 end
 
 local sCommand = tArgs[1]
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/rename.lua b/src/main/resources/data/computercraft/lua/rom/programs/rename.lua
index 8b491abcd..e627bb27f 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/rename.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/rename.lua
@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 2 then
-    print("Usage: rename <source> <destination>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <source> <destination>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/craft.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/craft.lua
index 65f93104b..ce9e84dc7 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/craft.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/craft.lua
@@ -11,7 +11,8 @@ end
 local tArgs = { ... }
 local nLimit = nil
 if #tArgs < 1 then
-    print("Usage: craft [number]")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " [number]")
     return
 else
     nLimit = tonumber(tArgs[1])
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/equip.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/equip.lua
index b69ef4c45..9f0d60735 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/equip.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/equip.lua
@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 local function printUsage()
-    print("Usage: equip <slot> <side>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <slot> <side>")
 end
 
 if #tArgs ~= 2 then
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/excavate.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/excavate.lua
index 9d4313eb1..1bb0488fe 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/excavate.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/excavate.lua
@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs ~= 1 then
-    print("Usage: excavate <diameter>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <diameter>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/go.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/go.lua
index 9c6de67ce..5b6c658e2 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/go.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/go.lua
@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: go <direction> <distance>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <direction> <distance>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/refuel.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/refuel.lua
index d9dd5b002..138cb9e47 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/refuel.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/refuel.lua
@@ -6,7 +6,8 @@ end
 local tArgs = { ... }
 local nLimit = 1
 if #tArgs > 1 then
-    print("Usage: refuel [number]")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " [number]")
     return
 elseif #tArgs > 0 then
     if tArgs[1] == "all" then
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/tunnel.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/tunnel.lua
index 34c0807d9..821965390 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/tunnel.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/tunnel.lua
@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs ~= 1 then
-    print("Usage: tunnel <length>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <length>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/turn.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/turn.lua
index e3fbbcbd3..c4d6ceeb7 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/turn.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/turn.lua
@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: turn <direction> <turns>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <direction> <turns>")
     return
 end
 
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/turtle/unequip.lua b/src/main/resources/data/computercraft/lua/rom/programs/turtle/unequip.lua
index 97501aa42..82a37c895 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/turtle/unequip.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/turtle/unequip.lua
@@ -5,7 +5,8 @@ end
 
 local tArgs = { ... }
 local function printUsage()
-    print("Usage: unequip <side>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <side>")
 end
 
 if #tArgs ~= 1 then
diff --git a/src/main/resources/data/computercraft/lua/rom/programs/type.lua b/src/main/resources/data/computercraft/lua/rom/programs/type.lua
index ccbaf0dd8..aa2ee54bb 100644
--- a/src/main/resources/data/computercraft/lua/rom/programs/type.lua
+++ b/src/main/resources/data/computercraft/lua/rom/programs/type.lua
@@ -1,6 +1,7 @@
 local tArgs = { ... }
 if #tArgs < 1 then
-    print("Usage: type <path>")
+    local programName = arg[0] or fs.getName(shell.getRunningProgram())
+    print("Usage: " .. programName .. " <path>")
     return
 end
 
diff --git a/src/test/resources/test-rom/spec/programs/command/exec_spec.lua b/src/test/resources/test-rom/spec/programs/command/exec_spec.lua
index ba714629f..f5eecd3d3 100644
--- a/src/test/resources/test-rom/spec/programs/command/exec_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/command/exec_spec.lua
@@ -10,7 +10,7 @@ describe("The exec program", function()
     it("displays its usage when given no argument", function()
         stub(_G, "commands", {})
         expect(capture(stub, "/rom/programs/command/exec.lua"))
-            :matches { ok = true, output = "", error = "Usage: exec <command>\n" }
+            :matches { ok = true, output = "", error = "Usage: /rom/programs/command/exec.lua <command>\n" }
     end)
 
     it("runs a command", function()
diff --git a/src/test/resources/test-rom/spec/programs/copy_spec.lua b/src/test/resources/test-rom/spec/programs/copy_spec.lua
index 4ab043986..5bcdda8b0 100644
--- a/src/test/resources/test-rom/spec/programs/copy_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/copy_spec.lua
@@ -35,6 +35,6 @@ describe("The copy program", function()
 
     it("displays the usage when given no arguments", function()
         expect(capture(stub, "copy"))
-            :matches { ok = true, output = "Usage: cp <source> <destination>\n", error = "" }
+            :matches { ok = true, output = "Usage: copy <source> <destination>\n", error = "" }
     end)
 end)
diff --git a/src/test/resources/test-rom/spec/programs/move_spec.lua b/src/test/resources/test-rom/spec/programs/move_spec.lua
index 664010118..dcc156362 100644
--- a/src/test/resources/test-rom/spec/programs/move_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/move_spec.lua
@@ -69,6 +69,6 @@ describe("The move program", function()
 
     it("displays the usage with no arguments", function()
         expect(capture(stub, "move"))
-            :matches { ok = true, output = "Usage: mv <source> <destination>\n", error = "" }
+            :matches { ok = true, output = "Usage: move <source> <destination>\n", error = "" }
     end)
 end)
diff --git a/src/test/resources/test-rom/spec/programs/turtle/craft_spec.lua b/src/test/resources/test-rom/spec/programs/turtle/craft_spec.lua
index 11934b7ec..8e1f12bb1 100644
--- a/src/test/resources/test-rom/spec/programs/turtle/craft_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/turtle/craft_spec.lua
@@ -19,7 +19,7 @@ describe("The craft program", function()
         stub(_G, "turtle", { craft = function() end })
 
         expect(capture(stub, "/rom/programs/turtle/craft.lua"))
-            :matches { ok = true, output = "Usage: craft [number]\n", error = "" }
+            :matches { ok = true, output = "Usage: /rom/programs/turtle/craft.lua [number]\n", error = "" }
     end)
 
     it("crafts multiple items", function()
diff --git a/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua b/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua
index 09284f8a6..92f75b73c 100644
--- a/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua
@@ -13,7 +13,7 @@ describe("The turtle equip program", function()
         stub(_G, "turtle", {})
 
         expect(capture(stub, "/rom/programs/turtle/equip.lua"))
-            :matches { ok = true, output = "Usage: equip <slot> <side>\n", error = "" }
+            :matches { ok = true, output = "Usage: /rom/programs/turtle/equip.lua <slot> <side>\n", error = "" }
     end)
 
     it("equip nothing", function()
diff --git a/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua b/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua
index 986d028c1..485a66111 100644
--- a/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua
@@ -32,7 +32,7 @@ describe("The refuel program", function()
     it("displays its usage when given too many argument", function()
         setup_turtle(0, 5, 0)
         expect(capture(stub, "/rom/programs/turtle/refuel.lua a b"))
-            :matches { ok = true, output = "Usage: refuel [number]\n", error = "" }
+            :matches { ok = true, output = "Usage: /rom/programs/turtle/refuel.lua [number]\n", error = "" }
     end)
 
     it("requires a numeric argument", function()
diff --git a/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua b/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua
index eea58f78f..1d81334f6 100644
--- a/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua
+++ b/src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua
@@ -13,7 +13,7 @@ describe("The turtle unequip program", function()
         stub(_G, "turtle", {})
 
         expect(capture(stub, "/rom/programs/turtle/unequip.lua"))
-            :matches { ok = true, output = "Usage: unequip <side>\n", error = "" }
+            :matches { ok = true, output = "Usage: /rom/programs/turtle/unequip.lua <side>\n", error = "" }
     end)
 
     it("says when nothing was unequipped", function()