diff --git a/basis/command-line/command-line-tests.factor b/basis/command-line/command-line-tests.factor
index d11c69e69bb..f9dd067000b 100644
--- a/basis/command-line/command-line-tests.factor
+++ b/basis/command-line/command-line-tests.factor
@@ -1,33 +1,33 @@
 USING: command-line namespaces tools.test ;
 
-{ "factor" f { "a" "b" "c" } } [
+{ f { "a" "b" "c" } } [
     { "factor" "-run=test-voc" "a" "b" "c" } parse-command-line
-    executable get script get command-line get
+    script get command-line get
 ] unit-test
 
-{ "factor" f { "-a" "b" "c" } } [
+{ f { "-a" "b" "c" } } [
     { "factor" "-run=test-voc" "-a" "b" "c" } parse-command-line
-    executable get script get command-line get
+    script get command-line get
 ] unit-test
 
-{ "factor" f { "a" "-b" "c" } } [
+{ f { "a" "-b" "c" } } [
     { "factor" "-run=test-voc" "a" "-b" "c" } parse-command-line
-    executable get script get command-line get
+    script get command-line get
 ] unit-test
 
-{ "factor" f { "a" "b" "-c" } } [
+{ f { "a" "b" "-c" } } [
     { "factor" "-run=test-voc" "a" "b" "-c" } parse-command-line
-    executable get script get command-line get
+    script get command-line get
 ] unit-test
 
-{ "factor" "a" { "b" "c" } } [
+{ "a" { "b" "c" } } [
     { "factor" "a" "b" "c" } parse-command-line
-    executable get script get command-line get
+    script get command-line get
 ] unit-test
 
-{ "factor" "a" { "b" "c" } } [
+{ "a" { "b" "c" } } [
     { "factor" "-foo" "a" "b" "c" } parse-command-line
-    executable get script get command-line get
+    script get command-line get
 ] unit-test
 
 { "a:b:c" } [ { "factor" "-roots=a:b:c" } parse-command-line
diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 5ab6245b7c3..a6559a19e14 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -17,8 +17,7 @@ IN: tools.deploy.shaker
 
 : add-command-line-hook ( -- )
     [
-        (command-line) unclip
-        executable set-global
+        (command-line) rest
         command-line set-global
     ] "command-line" startup-hooks get set-at ;