diff --git a/Rakefile b/Rakefile
index 1d96e82..be2d9e0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,8 +10,10 @@ DEBUG  = ENV.has_key?('DEBUG') &&
 ALL_SOURCES =FileList['src/*']
 SOURCES = ALL_SOURCES.select { |c| c =~ /\.c$/ }
 OBJECTS = SOURCES.pathmap( "%{^src,build}X.o" )
-TEST_SOURCES = FileList['tests/*.c']
-TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests,build/tests}X.o" )
+TEST_SOURCES = FileList['tests/unit/*.c']
+p TEST_SOURCES
+TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests/unit,build/tests}X.o" )
+p TEST_OBJECTS
 
 LIBS    = %w( pthread )
 CCFLAGS = %w(
@@ -25,7 +27,8 @@ CCFLAGS = %w(
 LDFLAGS = []
 LIBCHECK = "/usr/lib/libcheck.a"
 
-TEST_MODULES = Dir["tests/check_*.c"].map { |n| n[12..-3] }
+TEST_MODULES = Dir["tests/unit/check_*.c"].map { |n|
+  File.basename( n )[%r{check_(.+)\.c},1] }
 
 if DEBUG
   LDFLAGS << ["-g"]
diff --git a/tests/check_acl.c b/tests/unit/check_acl.c
similarity index 100%
rename from tests/check_acl.c
rename to tests/unit/check_acl.c
diff --git a/tests/check_bitset.c b/tests/unit/check_bitset.c
similarity index 100%
rename from tests/check_bitset.c
rename to tests/unit/check_bitset.c
diff --git a/tests/check_client.c b/tests/unit/check_client.c
similarity index 100%
rename from tests/check_client.c
rename to tests/unit/check_client.c
diff --git a/tests/check_control.c b/tests/unit/check_control.c
similarity index 100%
rename from tests/check_control.c
rename to tests/unit/check_control.c
diff --git a/tests/check_flexnbd.c b/tests/unit/check_flexnbd.c
similarity index 100%
rename from tests/check_flexnbd.c
rename to tests/unit/check_flexnbd.c
diff --git a/tests/check_ioutil.c b/tests/unit/check_ioutil.c
similarity index 100%
rename from tests/check_ioutil.c
rename to tests/unit/check_ioutil.c
diff --git a/tests/check_listen.c b/tests/unit/check_listen.c
similarity index 100%
rename from tests/check_listen.c
rename to tests/unit/check_listen.c
diff --git a/tests/check_mbox.c b/tests/unit/check_mbox.c
similarity index 100%
rename from tests/check_mbox.c
rename to tests/unit/check_mbox.c
diff --git a/tests/check_nbdtypes.c b/tests/unit/check_nbdtypes.c
similarity index 100%
rename from tests/check_nbdtypes.c
rename to tests/unit/check_nbdtypes.c
diff --git a/tests/check_parse.c b/tests/unit/check_parse.c
similarity index 100%
rename from tests/check_parse.c
rename to tests/unit/check_parse.c
diff --git a/tests/check_readwrite.c b/tests/unit/check_readwrite.c
similarity index 100%
rename from tests/check_readwrite.c
rename to tests/unit/check_readwrite.c
diff --git a/tests/check_self_pipe.c b/tests/unit/check_self_pipe.c
similarity index 100%
rename from tests/check_self_pipe.c
rename to tests/unit/check_self_pipe.c
diff --git a/tests/check_serve.c b/tests/unit/check_serve.c
similarity index 100%
rename from tests/check_serve.c
rename to tests/unit/check_serve.c
diff --git a/tests/check_status.c b/tests/unit/check_status.c
similarity index 100%
rename from tests/check_status.c
rename to tests/unit/check_status.c
diff --git a/tests/check_util.c b/tests/unit/check_util.c
similarity index 100%
rename from tests/check_util.c
rename to tests/unit/check_util.c