diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 7775e67523..084fb70d72 100644
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -142,7 +142,7 @@ os macosx? [
 [ t ] [
     "tools.deploy.test.18" shake-and-bake
     deploy-test-command ascii [ readln ] with-process-reader
-    "test.image" temp-file =
+    test-image temp-file =
 ] unit-test
 
 [ ] [ "resource:license.txt" "license.txt" temp-file copy-file ] unit-test
diff --git a/basis/tools/deploy/test/test.factor b/basis/tools/deploy/test/test.factor
index bc458dde36..5372ddf320 100644
--- a/basis/tools/deploy/test/test.factor
+++ b/basis/tools/deploy/test/test.factor
@@ -1,19 +1,23 @@
-USING: accessors arrays continuations io.directories io.files.info
-io.files.temp io.launcher io.backend kernel layouts math sequences system
+USING: accessors arrays bootstrap.image continuations
+io.directories io.files.info io.files.temp io.launcher
+io.backend kernel layouts math sequences system
 tools.deploy.backend tools.deploy.config.editor ;
 IN: tools.deploy.test
 
+: test-image ( -- str )
+    my-arch "test." ".image" surround ;
+
 : shake-and-bake ( vocab -- )
-    [ "test.image" temp-file delete-file ] ignore-errors
+    [ test-image temp-file delete-file ] ignore-errors
     "resource:" [
-        [ vm "test.image" temp-file ] dip
+        [ vm test-image temp-file ] dip
         dup deploy-config make-deploy-image drop
     ] with-directory ;
 
 ERROR: image-too-big actual-size max-size ;
 
 : small-enough? ( n -- )
-    [ "test.image" temp-file file-info size>> ]
+    [ test-image temp-file file-info size>> ]
     [
         cell 4 / *
         cpu ppc? [ 100000 + ] when
@@ -24,7 +28,7 @@ ERROR: image-too-big actual-size max-size ;
 : deploy-test-command ( -- args )
     os macosx?
     "resource:Factor.app/Contents/MacOS/factor" normalize-path vm ?
-    "-i=" "test.image" temp-file append 2array ;
+    "-i=" test-image temp-file append 2array ;
 
 : run-temp-image ( -- )
     deploy-test-command try-output-process ;