diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ad167e94..7eea4821b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,16 +322,16 @@ add_executable( api tests/api.cpp )
 target_link_libraries( api fc )
 
 if( ECC_IMPL STREQUAL secp256k1 )
-    add_executable( blind tests/all_tests.cpp tests/blind.cpp )
+    add_executable( blind tests/all_tests.cpp tests/crypto/blind.cpp )
     target_link_libraries( blind fc )
 endif()
 
 include_directories( vendor/websocketpp )
 
-add_executable( ntp_test tests/all_tests.cpp tests/ntp_test.cpp )
+add_executable( ntp_test tests/all_tests.cpp tests/network/ntp_test.cpp )
 target_link_libraries( ntp_test fc )
 
-add_executable( task_cancel_test tests/all_tests.cpp tests/task_cancel.cpp )
+add_executable( task_cancel_test tests/all_tests.cpp tests/thread/task_cancel.cpp )
 target_link_libraries( task_cancel_test fc )
 
 
@@ -348,7 +348,7 @@ target_link_libraries( udt_server fc udt )
 add_executable( udt_client tests/udtc.cpp )
 target_link_libraries( udt_client fc udt )
 
-add_executable( ecc_test tests/ecc_test.cpp )
+add_executable( ecc_test tests/crypto/ecc_test.cpp )
 target_link_libraries( ecc_test fc )
 
 #add_executable( test_aes tests/aes_test.cpp )
@@ -358,11 +358,15 @@ target_link_libraries( ecc_test fc )
 #add_executable( test_rate_limiting tests/rate_limiting.cpp )
 #target_link_libraries( test_rate_limiting fc )
 
-add_executable( all_tests tests/all_tests.cpp tests/blind.cpp
+add_executable( all_tests tests/all_tests.cpp
+                          tests/compress/compress.cpp
+                          tests/crypto/aes_test.cpp
+                          tests/crypto/blind.cpp
+                          tests/network/ntp_test.cpp
+                          tests/thread/task_cancel.cpp
                           tests/bloom_test.cpp
-                          tests/compress.cpp tests/ntp_test.cpp
                           tests/real128_test.cpp
-                          tests/task_cancel.cpp )
+                          )
 target_link_libraries( all_tests fc )
 
 if(WIN32)
diff --git a/README-ecc.md b/README-ecc.md
index b1df7a0d5..32942d2b1 100644
--- a/README-ecc.md
+++ b/README-ecc.md
@@ -22,8 +22,8 @@ your system.
 Testing
 -------
 
-Type "make ecc_test" to build the ecc_test executable from tests/ecc_test.cpp
-with the currently configured ECC implementation.
+Type "make ecc_test" to build the ecc_test executable from
+tests/crypto/ecc_test.cpp with the currently configured ECC implementation.
 
 ecc_test expects two arguments:
 
@@ -38,6 +38,6 @@ If the file does exist, intermediate results from the current ECC backend
 are compared with the file contents.
 
 For a full round of interoperability testing, you can use the script
-tests/ecc-interop.sh .
+tests/crypto/ecc-interop.sh .
 None of the test runs should produce any output.
 
diff --git a/tests/compress.cpp b/tests/compress/compress.cpp
similarity index 100%
rename from tests/compress.cpp
rename to tests/compress/compress.cpp
diff --git a/tests/aes_test.cpp b/tests/crypto/aes_test.cpp
similarity index 100%
rename from tests/aes_test.cpp
rename to tests/crypto/aes_test.cpp
diff --git a/tests/blind.cpp b/tests/crypto/blind.cpp
similarity index 100%
rename from tests/blind.cpp
rename to tests/crypto/blind.cpp
diff --git a/tests/ecc-interop.sh b/tests/crypto/ecc-interop.sh
similarity index 100%
rename from tests/ecc-interop.sh
rename to tests/crypto/ecc-interop.sh
diff --git a/tests/ecc_test.cpp b/tests/crypto/ecc_test.cpp
similarity index 100%
rename from tests/ecc_test.cpp
rename to tests/crypto/ecc_test.cpp
diff --git a/tests/ecc_test.interop.data b/tests/ecc_test.interop.data
deleted file mode 100644
index d8c927748..000000000
Binary files a/tests/ecc_test.interop.data and /dev/null differ
diff --git a/tests/ntp_test.cpp b/tests/network/ntp_test.cpp
similarity index 100%
rename from tests/ntp_test.cpp
rename to tests/network/ntp_test.cpp
diff --git a/tests/task_cancel.cpp b/tests/thread/task_cancel.cpp
similarity index 100%
rename from tests/task_cancel.cpp
rename to tests/thread/task_cancel.cpp