20 files changed, 19 insertions, 19 deletions
diff --git a/auto/make b/auto/make
index b077912d..f590f3eb 100644
--- a/auto/make
+++ b/auto/make
@@ -7,7 +7,7 @@
 $echo "creating $NXT_MAKEFILE"
 
 mkdir -p $NXT_BUILD_DIR/src \
-         $NXT_BUILD_DIR/test
+         $NXT_BUILD_DIR/src/test
 
 
 cat << END > $NXT_MAKEFILE
diff --git a/auto/sources b/auto/sources
index 473fe2f3..08083b96 100644
--- a/auto/sources
+++ b/auto/sources
@@ -199,30 +199,30 @@ NXT_LIB_HPUX_SENDFILE_SRCS="src/nxt_hpux_sendfile.c"
 NXT_TEST_BUILD_DEPS="src/nxt_test_build.h"
 NXT_TEST_BUILD_SRCS="src/nxt_test_build.c"
 
-NXT_TEST_DEPS="test/nxt_tests.h \
-    test/nxt_rbtree1.h \
+NXT_TEST_DEPS="src/test/nxt_tests.h \
+    src/test/nxt_rbtree1.h \
 "
 
 NXT_TEST_SRCS=" \
-    test/nxt_tests.c \
-    test/nxt_rbtree1.c \
-    test/nxt_rbtree_test.c \
-    test/nxt_term_parse_test.c \
-    test/nxt_msec_diff_test.c \
-    test/nxt_mp_test.c \
-    test/nxt_mem_zone_test.c \
-    test/nxt_lvlhsh_test.c \
-    test/nxt_gmtime_test.c \
-    test/nxt_sprintf_test.c \
-    test/nxt_malloc_test.c \
-    test/nxt_utf8_test.c \
-    test/nxt_rbtree1_test.c \
-    test/nxt_http_parse_test.c \
-    test/nxt_strverscmp_test.c \
+    src/test/nxt_tests.c \
+    src/test/nxt_rbtree1.c \
+    src/test/nxt_rbtree_test.c \
+    src/test/nxt_term_parse_test.c \
+    src/test/nxt_msec_diff_test.c \
+    src/test/nxt_mp_test.c \
+    src/test/nxt_mem_zone_test.c \
+    src/test/nxt_lvlhsh_test.c \
+    src/test/nxt_gmtime_test.c \
+    src/test/nxt_sprintf_test.c \
+    src/test/nxt_malloc_test.c \
+    src/test/nxt_utf8_test.c \
+    src/test/nxt_rbtree1_test.c \
+    src/test/nxt_http_parse_test.c \
+    src/test/nxt_strverscmp_test.c \
 "
 
 NXT_LIB_UTF8_FILE_NAME_TEST_SRCS=" \
-    test/nxt_utf8_file_name_test.c \
+    src/test/nxt_utf8_file_name_test.c \
 "
 
 
diff --git a/test/nxt_gmtime_test.c b/src/test/nxt_gmtime_test.c
index cec81ab4..cec81ab4 100644
--- a/test/nxt_gmtime_test.c
+++ b/src/test/nxt_gmtime_test.c
diff --git a/test/nxt_http_parse_test.c b/src/test/nxt_http_parse_test.c
index d2af4245..d2af4245 100644
--- a/test/nxt_http_parse_test.c
+++ b/src/test/nxt_http_parse_test.c
diff --git a/test/nxt_lvlhsh_test.c b/src/test/nxt_lvlhsh_test.c
index 62139fe6..62139fe6 100644
--- a/test/nxt_lvlhsh_test.c
+++ b/src/test/nxt_lvlhsh_test.c
diff --git a/test/nxt_malloc_test.c b/src/test/nxt_malloc_test.c
index daa609b1..daa609b1 100644
--- a/test/nxt_malloc_test.c
+++ b/src/test/nxt_malloc_test.c
diff --git a/test/nxt_mem_zone_test.c b/src/test/nxt_mem_zone_test.c
index faf0feee..faf0feee 100644
--- a/test/nxt_mem_zone_test.c
+++ b/src/test/nxt_mem_zone_test.c
diff --git a/test/nxt_mp_test.c b/src/test/nxt_mp_test.c
index 39aa939d..39aa939d 100644
--- a/test/nxt_mp_test.c
+++ b/src/test/nxt_mp_test.c
diff --git a/test/nxt_msec_diff_test.c b/src/test/nxt_msec_diff_test.c
index 5af7c011..5af7c011 100644
--- a/test/nxt_msec_diff_test.c
+++ b/src/test/nxt_msec_diff_test.c
diff --git a/test/nxt_rbtree1.c b/src/test/nxt_rbtree1.c
index 1ae059ab..1ae059ab 100644
--- a/test/nxt_rbtree1.c
+++ b/src/test/nxt_rbtree1.c
diff --git a/test/nxt_rbtree1.h b/src/test/nxt_rbtree1.h
index 60048dad..60048dad 100644
--- a/test/nxt_rbtree1.h
+++ b/src/test/nxt_rbtree1.h
diff --git a/test/nxt_rbtree1_test.c b/src/test/nxt_rbtree1_test.c
index d4783ea1..d4783ea1 100644
--- a/test/nxt_rbtree1_test.c
+++ b/src/test/nxt_rbtree1_test.c
diff --git a/test/nxt_rbtree_test.c b/src/test/nxt_rbtree_test.c
index 41375d92..41375d92 100644
--- a/test/nxt_rbtree_test.c
+++ b/src/test/nxt_rbtree_test.c
diff --git a/test/nxt_sprintf_test.c b/src/test/nxt_sprintf_test.c
index 7c6e2019..7c6e2019 100644
--- a/test/nxt_sprintf_test.c
+++ b/src/test/nxt_sprintf_test.c
diff --git a/test/nxt_strverscmp_test.c b/src/test/nxt_strverscmp_test.c
index 40adbfb2..40adbfb2 100644
--- a/test/nxt_strverscmp_test.c
+++ b/src/test/nxt_strverscmp_test.c
diff --git a/test/nxt_term_parse_test.c b/src/test/nxt_term_parse_test.c
index 83ae4931..83ae4931 100644
--- a/test/nxt_term_parse_test.c
+++ b/src/test/nxt_term_parse_test.c
diff --git a/test/nxt_tests.c b/src/test/nxt_tests.c
index 7cba0f69..7cba0f69 100644
--- a/test/nxt_tests.c
+++ b/src/test/nxt_tests.c
diff --git a/test/nxt_tests.h b/src/test/nxt_tests.h
index be4168cf..be4168cf 100644
--- a/test/nxt_tests.h
+++ b/src/test/nxt_tests.h
diff --git a/test/nxt_utf8_file_name_test.c b/src/test/nxt_utf8_file_name_test.c
index 6861205e..6861205e 100644
--- a/test/nxt_utf8_file_name_test.c
+++ b/src/test/nxt_utf8_file_name_test.c
diff --git a/test/nxt_utf8_test.c b/src/test/nxt_utf8_test.c
index c7323876..c7323876 100644
--- a/test/nxt_utf8_test.c
+++ b/src/test/nxt_utf8_test.c