diff --git a/basis/csv/csv-tests.factor b/basis/csv/csv-tests.factor
index 8afefbaf66..533c6f00ec 100644
--- a/basis/csv/csv-tests.factor
+++ b/basis/csv/csv-tests.factor
@@ -1,6 +1,6 @@
 USING: io.streams.string csv tools.test kernel strings
-io.pathnames io.files.unique io.encodings.utf8 io.files
-io.directories ;
+io.pathnames io.files.temp io.files.unique io.encodings.utf8
+io.files io.directories ;
 IN: csv.tests
 
 ! I like to name my unit tests
diff --git a/basis/ftp/server/server-tests.factor b/basis/ftp/server/server-tests.factor
index edb8113704..7f5148d1e7 100644
--- a/basis/ftp/server/server-tests.factor
+++ b/basis/ftp/server/server-tests.factor
@@ -1,6 +1,6 @@
 USING: calendar ftp.server io.encodings.ascii io.files
-io.files.unique namespaces threads tools.test kernel
-io.servers ftp.client accessors urls
+io.files.temp io.files.unique namespaces threads tools.test
+kernel io.servers ftp.client accessors urls
 io.pathnames io.directories sequences fry io.backend
 continuations ;
 FROM: ftp.client => ftp-get ;
diff --git a/basis/io/directories/search/search-tests.factor b/basis/io/directories/search/search-tests.factor
index 3d7284f9d6..15e501da5b 100644
--- a/basis/io/directories/search/search-tests.factor
+++ b/basis/io/directories/search/search-tests.factor
@@ -1,7 +1,7 @@
 USING: combinators.smart io.directories
 io.directories.hierarchy io.directories.search io.files
-io.files.unique io.pathnames kernel namespaces sequences
-sorting strings tools.test ;
+io.files.temp io.files.unique io.pathnames kernel namespaces
+sequences sorting strings tools.test ;
 IN: io.directories.search.tests
 
 { t } [
diff --git a/basis/io/files/links/unix/unix-tests.factor b/basis/io/files/links/unix/unix-tests.factor
index 2ab39514f5..1222ed73ae 100644
--- a/basis/io/files/links/unix/unix-tests.factor
+++ b/basis/io/files/links/unix/unix-tests.factor
@@ -1,6 +1,6 @@
 USING: io.directories io.files.links tools.test sequences
-io.files.unique tools.files fry math kernel math.parser
-io.pathnames namespaces ;
+io.files.temp io.files.unique tools.files fry math kernel
+math.parser io.pathnames namespaces ;
 IN: io.files.links.unix.tests
 
 : make-test-links ( n path -- )
diff --git a/basis/io/files/unique/unique-tests.factor b/basis/io/files/unique/unique-tests.factor
index 108c862088..f71a28f78d 100644
--- a/basis/io/files/unique/unique-tests.factor
+++ b/basis/io/files/unique/unique-tests.factor
@@ -1,7 +1,7 @@
-USING: accessors io.directories io.directories.hierarchy
-io.encodings.ascii io.files io.files.info io.files.temp
-io.files.unique io.pathnames kernel namespaces sequences strings
-tools.test ;
+USING: accessors continuations io.directories
+io.directories.hierarchy io.encodings.ascii io.files
+io.files.info io.files.temp io.files.unique io.pathnames kernel
+namespaces sequences strings tools.test ;
 IN: io.files.unique.tests
 
 { 123 } [
diff --git a/extra/graphviz/graphviz-tests.factor b/extra/graphviz/graphviz-tests.factor
index 4cd58c1260..1746c23adc 100644
--- a/extra/graphviz/graphviz-tests.factor
+++ b/extra/graphviz/graphviz-tests.factor
@@ -2,10 +2,10 @@ USING: accessors arrays assocs combinators.short-circuit
 continuations formatting graphviz graphviz.attributes
 graphviz.dot graphviz.notation graphviz.render
 graphviz.render.private images.loader.private io.directories
-io.directories.hierarchy io.files io.files.unique io.launcher
-io.pathnames kernel locals make math math.combinatorics
-math.parser memoize namespaces sequences sequences.extras sets
-splitting system tools.test ;
+io.directories.hierarchy io.files io.files.temp io.files.unique
+io.launcher io.pathnames kernel locals make math
+math.combinatorics math.parser memoize namespaces sequences
+sequences.extras sets splitting system tools.test ;
 IN: graphviz.tests
 
 ! XXX hack
@@ -48,9 +48,11 @@ SYMBOLS: supported-layouts supported-formats ;
     supported-formats get-global next! :> -T
     supported-layouts get-global next! :> -K
     [
-        graph "smoke-test" -T -K graphviz
-        "smoke-test" graphviz-output-appears-to-exist?
-    ] cleanup-unique-working-directory ;
+        [
+            graph "smoke-test" -T -K graphviz
+            "smoke-test" graphviz-output-appears-to-exist?
+        ] cleanup-unique-directory
+    ] with-temp-directory ;
 
 : preview-smoke-test ( graph -- pass? )
     f "pass?" [