diff --git a/Makefile.am b/Makefile.am
index bdada69..a706a1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,8 +44,8 @@ DIST_SUBDIRS = gtest/googletest
 check_PROGRAMS += \
 	capn-test
 capn_test_SOURCES = \
-	capn-test.cpp \
-	capn-stream-test.cpp \
+	tests/capn-test.cpp \
+	tests/capn-stream-test.cpp \
 	compiler/test.capnp.c \
 	compiler/schema-test.cpp \
 	compiler/schema.capnp.c
diff --git a/capn-stream-test.cpp b/tests/capn-stream-test.cpp
similarity index 100%
rename from capn-stream-test.cpp
rename to tests/capn-stream-test.cpp
diff --git a/capn-test.cpp b/tests/capn-test.cpp
similarity index 100%
rename from capn-test.cpp
rename to tests/capn-test.cpp