diff --git a/core/alien/alien-tests.factor b/core/alien/alien-tests.factor
index 72feca27cd..5f7b9fff21 100755
--- a/core/alien/alien-tests.factor
+++ b/core/alien/alien-tests.factor
@@ -1,7 +1,7 @@
 IN: alien.tests
 USING: alien alien.accessors byte-arrays arrays kernel
 kernel.private namespaces tools.test sequences libc math system
-prettyprint ;
+prettyprint layouts ;
 
 [ t ] [ -1 <alien> alien-address 0 > ] unit-test
 
diff --git a/core/inference/class/class-tests.factor b/core/inference/class/class-tests.factor
index df90ac2291..17197db667 100755
--- a/core/inference/class/class-tests.factor
+++ b/core/inference/class/class-tests.factor
@@ -4,7 +4,7 @@ inference.dataflow optimizer tools.test kernel.private generic
 sequences words inference.class quotations alien
 alien.c-types strings sbufs sequences.private
 slots.private combinators definitions compiler.units
-system ;
+system layouts ;
 
 ! Make sure these compile even though this is invalid code
 [ ] [ [ 10 mod 3.0 /i ] dataflow optimize drop ] unit-test
diff --git a/core/layouts/layouts-tests.factor b/core/layouts/layouts-tests.factor
new file mode 100755
index 0000000000..cf50356f76
--- /dev/null
+++ b/core/layouts/layouts-tests.factor
@@ -0,0 +1,5 @@
+IN: system.tests
+USING: layouts math tools.test ;
+
+[ t ] [ cell integer? ] unit-test
+[ t ] [ bootstrap-cell integer? ] unit-test
diff --git a/core/system/system-tests.factor b/core/system/system-tests.factor
index ad0e5e07cb..4b074ed7aa 100755
--- a/core/system/system-tests.factor
+++ b/core/system/system-tests.factor
@@ -1,9 +1,6 @@
 USING: math tools.test system prettyprint namespaces kernel ;
 IN: system.tests
 
-[ t ] [ cell integer? ] unit-test
-[ t ] [ bootstrap-cell integer? ] unit-test
-
 wince? [
     [ ] [ os-envs . ] unit-test
 ] unless