diff --git a/extra/math/hashcodes/hashcodes-tests.factor b/extra/math/hashcodes/hashcodes-tests.factor
index cdc2c4f2ff..5d3573c445 100644
--- a/extra/math/hashcodes/hashcodes-tests.factor
+++ b/extra/math/hashcodes/hashcodes-tests.factor
@@ -1,20 +1,16 @@
 ! Copyright (C) 2013 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: arrays kernel math sequences tools.test ;
+USING: arrays kernel grouping math sequences tools.test ;
 
 IN: math.hashcodes
 
 { t } [
     12 dup >bignum 12.0 12 0 complex boa 4array
-    [ number-hashcode 12 = ] all?
+    [ number-hashcode ] map all-equal?
 ] unit-test
 
 { t } [
     1.5 3/2 1.5 0 complex boa 3/2 0 complex boa 4array
-    [
-        number-hashcode
-        cell-bits 64 = 3458764513820540928 3221225472 ?
-        =
-    ] all?
+    [ number-hashcode ] map all-equal?
 ] unit-test