diff --git a/Makefile.am b/Makefile.am
index d67fa3e2..9a828133 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,12 +385,11 @@ AM_CXXFLAGS += -I$(top_srcdir)
 TEST_BIN = 			\
     test/alloc/arena		\
     test/alloc/dynamic		\
-    test/alloc/stack		\
     test/alloc/linear		\
+    test/alloc/stack		\
     test/backtrace 		\
     test/bezier			\
     test/bitwise		\
-    test/checksum		\
     test/cmdopt			\
     test/colour			\
     test/coord			\
@@ -406,21 +405,25 @@ TEST_BIN = 			\
     test/format			\
     test/geom/aabb		\
     test/geom/ray 		\
-    test/hash/murmur		\
+    test/hash/checksum		\
     test/hash/fasthash          \
+    test/hash/hmac		\
+    test/hash/hotp		\
     test/hash/keccak		\
-    test/hmac			\
-    test/hotp			\
+    test/hash/md2		\
+    test/hash/md4		\
+    test/hash/md5		\
+    test/hash/murmur		\
+    test/hash/ripemd		\
+    test/hash/sha1		\
+    test/hash/sha2		\
     test/hton			\
     test/introspection		\
     test/ip 			\
     test/json_types		\
-    test/memory/deleter		\
     test/maths			\
     test/matrix			\
-    test/md2			\
-    test/md4			\
-    test/md5			\
+    test/memory/deleter		\
     test/point			\
     test/polynomial		\
     test/pool			\
@@ -429,10 +432,7 @@ TEST_BIN = 			\
     test/range 			\
     test/rational		\
     test/region			\
-    test/ripemd			\
     test/roots/bisection	\
-    test/sha1			\
-    test/sha2			\
     test/signal			\
     test/string			\
     test/stringid		\
diff --git a/test/checksum.cpp b/test/hash/checksum.cpp
similarity index 100%
rename from test/checksum.cpp
rename to test/hash/checksum.cpp
diff --git a/test/hmac.cpp b/test/hash/hmac.cpp
similarity index 100%
rename from test/hmac.cpp
rename to test/hash/hmac.cpp
diff --git a/test/hotp.cpp b/test/hash/hotp.cpp
similarity index 100%
rename from test/hotp.cpp
rename to test/hash/hotp.cpp
diff --git a/test/md2.cpp b/test/hash/md2.cpp
similarity index 100%
rename from test/md2.cpp
rename to test/hash/md2.cpp
diff --git a/test/md4.cpp b/test/hash/md4.cpp
similarity index 100%
rename from test/md4.cpp
rename to test/hash/md4.cpp
diff --git a/test/md5.cpp b/test/hash/md5.cpp
similarity index 100%
rename from test/md5.cpp
rename to test/hash/md5.cpp
diff --git a/test/ripemd.cpp b/test/hash/ripemd.cpp
similarity index 100%
rename from test/ripemd.cpp
rename to test/hash/ripemd.cpp
diff --git a/test/sha1.cpp b/test/hash/sha1.cpp
similarity index 100%
rename from test/sha1.cpp
rename to test/hash/sha1.cpp
diff --git a/test/sha2.cpp b/test/hash/sha2.cpp
similarity index 100%
rename from test/sha2.cpp
rename to test/hash/sha2.cpp