diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 24985f2337f46a619ed02153825a16e8552ed4e7..94e021684d1a5ffe3207acb65ca1dba2c1e4751b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -26,7 +26,7 @@ add_custom_target(test
 add_custom_target(test-force
     COMMAND ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --force --vardir=${PROJECT_BINARY_DIR}/test/var)
 
-add_subdirectory(app)
+add_subdirectory(app-tap)
 add_subdirectory(box)
 add_subdirectory(unit)
 
diff --git a/test/app/CMakeLists.txt b/test/app-tap/CMakeLists.txt
similarity index 100%
rename from test/app/CMakeLists.txt
rename to test/app-tap/CMakeLists.txt
diff --git a/test/app/clock.result b/test/app-tap/clock.result
similarity index 100%
rename from test/app/clock.result
rename to test/app-tap/clock.result
diff --git a/test/app/clock.test.lua b/test/app-tap/clock.test.lua
similarity index 100%
rename from test/app/clock.test.lua
rename to test/app-tap/clock.test.lua
diff --git a/test/app/console.result b/test/app-tap/console.result
similarity index 100%
rename from test/app/console.result
rename to test/app-tap/console.result
diff --git a/test/app/console.test.lua b/test/app-tap/console.test.lua
similarity index 100%
rename from test/app/console.test.lua
rename to test/app-tap/console.test.lua
diff --git a/test/app/csv.result b/test/app-tap/csv.result
similarity index 100%
rename from test/app/csv.result
rename to test/app-tap/csv.result
diff --git a/test/app/csv.test.lua b/test/app-tap/csv.test.lua
similarity index 100%
rename from test/app/csv.test.lua
rename to test/app-tap/csv.test.lua
diff --git a/test/app/errno.result b/test/app-tap/errno.result
similarity index 100%
rename from test/app/errno.result
rename to test/app-tap/errno.result
diff --git a/test/app/errno.test.lua b/test/app-tap/errno.test.lua
similarity index 100%
rename from test/app/errno.test.lua
rename to test/app-tap/errno.test.lua
diff --git a/test/app/info.result b/test/app-tap/info.result
similarity index 100%
rename from test/app/info.result
rename to test/app-tap/info.result
diff --git a/test/app/info.test.lua b/test/app-tap/info.test.lua
similarity index 100%
rename from test/app/info.test.lua
rename to test/app-tap/info.test.lua
diff --git a/test/app/init_script.result b/test/app-tap/init_script.result
similarity index 100%
rename from test/app/init_script.result
rename to test/app-tap/init_script.result
diff --git a/test/app/init_script.test.lua b/test/app-tap/init_script.test.lua
similarity index 100%
rename from test/app/init_script.test.lua
rename to test/app-tap/init_script.test.lua
diff --git a/test/app/inspector.result b/test/app-tap/inspector.result
similarity index 100%
rename from test/app/inspector.result
rename to test/app-tap/inspector.result
diff --git a/test/app/inspector.test.lua b/test/app-tap/inspector.test.lua
similarity index 100%
rename from test/app/inspector.test.lua
rename to test/app-tap/inspector.test.lua
diff --git a/test/app/json.result b/test/app-tap/json.result
similarity index 100%
rename from test/app/json.result
rename to test/app-tap/json.result
diff --git a/test/app/json.test.lua b/test/app-tap/json.test.lua
similarity index 100%
rename from test/app/json.test.lua
rename to test/app-tap/json.test.lua
diff --git a/test/app/logger.result b/test/app-tap/logger.result
similarity index 100%
rename from test/app/logger.result
rename to test/app-tap/logger.result
diff --git a/test/app/logger.test.lua b/test/app-tap/logger.test.lua
similarity index 100%
rename from test/app/logger.test.lua
rename to test/app-tap/logger.test.lua
diff --git a/test/app/lua/require_mod.lua b/test/app-tap/lua/require_mod.lua
similarity index 100%
rename from test/app/lua/require_mod.lua
rename to test/app-tap/lua/require_mod.lua
diff --git a/test/app/lua/serializer_test.lua b/test/app-tap/lua/serializer_test.lua
similarity index 100%
rename from test/app/lua/serializer_test.lua
rename to test/app-tap/lua/serializer_test.lua
diff --git a/test/app/minimal.result b/test/app-tap/minimal.result
similarity index 100%
rename from test/app/minimal.result
rename to test/app-tap/minimal.result
diff --git a/test/app/minimal.test.lua b/test/app-tap/minimal.test.lua
similarity index 100%
rename from test/app/minimal.test.lua
rename to test/app-tap/minimal.test.lua
diff --git a/test/app/module_api.c b/test/app-tap/module_api.c
similarity index 100%
rename from test/app/module_api.c
rename to test/app-tap/module_api.c
diff --git a/test/app/module_api.result b/test/app-tap/module_api.result
similarity index 100%
rename from test/app/module_api.result
rename to test/app-tap/module_api.result
diff --git a/test/app/module_api.skipcond b/test/app-tap/module_api.skipcond
similarity index 100%
rename from test/app/module_api.skipcond
rename to test/app-tap/module_api.skipcond
diff --git a/test/app/module_api.test.lua b/test/app-tap/module_api.test.lua
similarity index 100%
rename from test/app/module_api.test.lua
rename to test/app-tap/module_api.test.lua
diff --git a/test/app/msgpack.result b/test/app-tap/msgpack.result
similarity index 100%
rename from test/app/msgpack.result
rename to test/app-tap/msgpack.result
diff --git a/test/app/msgpack.test.lua b/test/app-tap/msgpack.test.lua
similarity index 100%
rename from test/app/msgpack.test.lua
rename to test/app-tap/msgpack.test.lua
diff --git a/test/app/msgpackffi.result b/test/app-tap/msgpackffi.result
similarity index 100%
rename from test/app/msgpackffi.result
rename to test/app-tap/msgpackffi.result
diff --git a/test/app/msgpackffi.test.lua b/test/app-tap/msgpackffi.test.lua
similarity index 100%
rename from test/app/msgpackffi.test.lua
rename to test/app-tap/msgpackffi.test.lua
diff --git a/test/app/pcall.result b/test/app-tap/pcall.result
similarity index 100%
rename from test/app/pcall.result
rename to test/app-tap/pcall.result
diff --git a/test/app/pcall.test.lua b/test/app-tap/pcall.test.lua
similarity index 100%
rename from test/app/pcall.test.lua
rename to test/app-tap/pcall.test.lua
diff --git a/test/app/snapshot.result b/test/app-tap/snapshot.result
similarity index 100%
rename from test/app/snapshot.result
rename to test/app-tap/snapshot.result
diff --git a/test/app/snapshot.test.lua b/test/app-tap/snapshot.test.lua
similarity index 100%
rename from test/app/snapshot.test.lua
rename to test/app-tap/snapshot.test.lua
diff --git a/test/app/suite.ini b/test/app-tap/suite.ini
similarity index 100%
rename from test/app/suite.ini
rename to test/app-tap/suite.ini
diff --git a/test/app/tap.result b/test/app-tap/tap.result
similarity index 100%
rename from test/app/tap.result
rename to test/app-tap/tap.result
diff --git a/test/app/tap.test.lua b/test/app-tap/tap.test.lua
similarity index 100%
rename from test/app/tap.test.lua
rename to test/app-tap/tap.test.lua
diff --git a/test/app/tarantoolctl.result b/test/app-tap/tarantoolctl.result
similarity index 100%
rename from test/app/tarantoolctl.result
rename to test/app-tap/tarantoolctl.result
diff --git a/test/app/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua
similarity index 100%
rename from test/app/tarantoolctl.test.lua
rename to test/app-tap/tarantoolctl.test.lua
diff --git a/test/app/uri.result b/test/app-tap/uri.result
similarity index 100%
rename from test/app/uri.result
rename to test/app-tap/uri.result
diff --git a/test/app/uri.test.lua b/test/app-tap/uri.test.lua
similarity index 100%
rename from test/app/uri.test.lua
rename to test/app-tap/uri.test.lua
diff --git a/test/app/yaml.result b/test/app-tap/yaml.result
similarity index 100%
rename from test/app/yaml.result
rename to test/app-tap/yaml.result
diff --git a/test/app/yaml.test.lua b/test/app-tap/yaml.test.lua
similarity index 100%
rename from test/app/yaml.test.lua
rename to test/app-tap/yaml.test.lua