diff --git a/basis/checksums/sha/sha-tests.factor b/basis/checksums/sha/sha-tests.factor
index c0e59bf2a2..ef211821d6 100644
--- a/basis/checksums/sha/sha-tests.factor
+++ b/basis/checksums/sha/sha-tests.factor
@@ -1,6 +1,7 @@
 USING: arrays checksums checksums.common checksums.sha
 checksums.sha.private io.encodings.binary io.streams.byte-array
 kernel math.parser sequences tools.test random ;
+IN: checksums.sha.tests
 
 { "a9993e364706816aba3e25717850c26c9cd0d89d" } [ "abc" sha1 checksum-bytes bytes>hex-string ] unit-test
 { "84983e441c3bd26ebaae4aa1f95129e5e54670f1" } [ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" sha1 checksum-bytes bytes>hex-string ] unit-test
diff --git a/basis/math/primes/erato/fast/fast-tests.factor b/basis/math/primes/erato/fast/fast-tests.factor
index d62668c759..69bf973d6c 100644
--- a/basis/math/primes/erato/fast/fast-tests.factor
+++ b/basis/math/primes/erato/fast/fast-tests.factor
@@ -1,4 +1,4 @@
-USING: fry kernel sequences tools.test ;
+USING: fry kernel math.primes.erato.fast sequences tools.test ;
 
 {
 
diff --git a/core/math/integers/integers-tests.factor b/core/math/integers/integers-tests.factor
index 46c00fb11c..263a329e26 100644
--- a/core/math/integers/integers-tests.factor
+++ b/core/math/integers/integers-tests.factor
@@ -1,6 +1,7 @@
 USING: continuations kernel math math.functions math.order
 math.private namespaces prettyprint prettyprint.config random
 sequences tools.test ;
+IN: math.integers.tests
 
 10 number-base [
     [ "-8" ] [ -8 unparse ] unit-test
diff --git a/core/source-files/errors/errors-tests.factor b/core/source-files/errors/errors-tests.factor
index 068bc7c462..b96458fccb 100644
--- a/core/source-files/errors/errors-tests.factor
+++ b/core/source-files/errors/errors-tests.factor
@@ -1,5 +1,6 @@
 USING: assocs compiler.errors compiler.units definitions
 namespaces tools.test words ;
+IN: source-files.errors.tests
 
 DEFER: forget-test
 
diff --git a/extra/base85/base85-tests.factor b/extra/base85/base85-tests.factor
index d190d7483e..3c978ef56f 100644
--- a/extra/base85/base85-tests.factor
+++ b/extra/base85/base85-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel strings tools.test ;
+USING: base85 kernel strings tools.test ;
 
 { t } [ "Hello, world" dup >base85 base85> >string = ] unit-test
 
diff --git a/extra/grouping/extras/extras-tests.factor b/extra/grouping/extras/extras-tests.factor
index 24a1a7ec8b..c02e268f1b 100644
--- a/extra/grouping/extras/extras-tests.factor
+++ b/extra/grouping/extras/extras-tests.factor
@@ -1,4 +1,5 @@
-USING: arrays kernel math math.functions sequences tools.test ;
+USING: arrays grouping.extras kernel math math.functions
+sequences tools.test ;
 
 { { } } [ { 1 } [ 2array ] 2clump-map ] unit-test
 { { { 1 2 } } } [ { 1 2 } [ 2array ] 2clump-map ] unit-test
diff --git a/extra/math/binpack/binpack-tests.factor b/extra/math/binpack/binpack-tests.factor
index 032ca8d86d..64d7016331 100644
--- a/extra/math/binpack/binpack-tests.factor
+++ b/extra/math/binpack/binpack-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: kernel tools.test sequences ;
+USING: kernel math.binpack sequences tools.test ;
 
 { { V{ } } } [ { } 1 binpack ] unit-test