diff --git a/extra/sequences/rotated/rotated-tests.factor b/extra/sequences/rotated/rotated-tests.factor
index 2236e15d34..b39e574a7e 100644
--- a/extra/sequences/rotated/rotated-tests.factor
+++ b/extra/sequences/rotated/rotated-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-USING: strings tools.test ;
+USING: sequences.rotated strings tools.test ;
 
 { "fasd" } [ "asdf" -1 <rotated> >string ] unit-test
 { "sdfa" } [ "asdf" 1 <rotated> >string ] unit-test
diff --git a/extra/sequences/shifted/shifted-tests.factor b/extra/sequences/shifted/shifted-tests.factor
index d7510eab30..313774bfc9 100644
--- a/extra/sequences/shifted/shifted-tests.factor
+++ b/extra/sequences/shifted/shifted-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2013 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-USING: arrays sequences tools.test ;
+USING: arrays sequences sequences.shifted tools.test ;
 
 { { 1 2 3 7 } } [ 4 <iota> -1 7 <shifted> >array ] unit-test
 { { 7 0 1 2 } } [ 4 <iota> 1 7 <shifted> >array ] unit-test
diff --git a/extra/sequences/snipped/snipped-tests.factor b/extra/sequences/snipped/snipped-tests.factor
index b74b9c9a3a..f3d3c9b83b 100644
--- a/extra/sequences/snipped/snipped-tests.factor
+++ b/extra/sequences/snipped/snipped-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2013 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-USING: arrays sequences tools.test ;
+USING: arrays sequences sequences.snipped tools.test ;
 
 { { 0 1 2 5 6 } } [ 3 5 7 <iota> <snipped> >array ] unit-test
 { { 0 1 2 } } [ 3 10 7 <iota> <snipped> >array ] unit-test
diff --git a/extra/sequences/zipped/zipped-tests.factor b/extra/sequences/zipped/zipped-tests.factor
index 884d5fc846..edfb231787 100644
--- a/extra/sequences/zipped/zipped-tests.factor
+++ b/extra/sequences/zipped/zipped-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
-USING: arrays tools.test ;
+USING: arrays sequences.zipped tools.test ;
 
 { { { 1 4 } { 2 5 } { 3 6 } } }
 [ { 1 2 3 } { 4 5 6 } <zipped> >array ] unit-test
diff --git a/extra/sorting/bubble/bubble-tests.factor b/extra/sorting/bubble/bubble-tests.factor
index 01eeb6288e..0dbe1263e5 100644
--- a/extra/sorting/bubble/bubble-tests.factor
+++ b/extra/sorting/bubble/bubble-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel tools.test ;
+USING: kernel sorting.bubble tools.test ;
 
 { { } } [ { } dup natural-bubble-sort! ] unit-test
 { { 1 } } [ { 1 } dup natural-bubble-sort! ] unit-test
diff --git a/extra/sorting/heap/heap-tests.factor b/extra/sorting/heap/heap-tests.factor
index 53f5608051..7c0f5cc43c 100644
--- a/extra/sorting/heap/heap-tests.factor
+++ b/extra/sorting/heap/heap-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel sequences tools.test ;
+USING: kernel sequences sorting.heap tools.test ;
 
 { { } } [ { } heapsort ] unit-test
 { { 1 } } [ { 1 } heapsort ] unit-test
diff --git a/extra/sorting/quick/quick-tests.factor b/extra/sorting/quick/quick-tests.factor
index ac7774bbfd..ddaefbee31 100644
--- a/extra/sorting/quick/quick-tests.factor
+++ b/extra/sorting/quick/quick-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel sequences tools.test ;
+USING: kernel sequences sorting.quick tools.test ;
 
 { { } } [ { } dup natural-sort! ] unit-test
 { { 1 } } [ { 1 } dup natural-sort! ] unit-test
diff --git a/extra/splitting/extras/extras-tests.factor b/extra/splitting/extras/extras-tests.factor
index 2ec7f23f27..263275cb18 100644
--- a/extra/splitting/extras/extras-tests.factor
+++ b/extra/splitting/extras/extras-tests.factor
@@ -1,5 +1,5 @@
-
-USING: ascii kernel math sequences strings tools.test ;
+USING: ascii kernel math sequences splitting.extras strings
+tools.test ;
 
 { { } } [ { } { 0 } split* ] unit-test
 { { { 1 2 3 } } } [ { 1 2 3 } { 0 } split* ] unit-test
diff --git a/extra/uu/uu-tests.factor b/extra/uu/uu-tests.factor
index 7cd30d7bb0..b3f016c7a3 100644
--- a/extra/uu/uu-tests.factor
+++ b/extra/uu/uu-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel tools.test ;
+USING: kernel tools.test uu ;
 IN: uu.tests
 
 CONSTANT: plain