diff --git a/test/app/cfg.result b/test/box-tap/cfg.result
similarity index 100%
rename from test/app/cfg.result
rename to test/box-tap/cfg.result
diff --git a/test/app/cfg.test.lua b/test/box-tap/cfg.test.lua
similarity index 100%
rename from test/app/cfg.test.lua
rename to test/box-tap/cfg.test.lua
diff --git a/test/app/cfgup.result b/test/box-tap/cfgup.result
similarity index 100%
rename from test/app/cfgup.result
rename to test/box-tap/cfgup.result
diff --git a/test/app/cfgup.test.lua b/test/box-tap/cfgup.test.lua
similarity index 100%
rename from test/app/cfgup.test.lua
rename to test/box-tap/cfgup.test.lua
diff --git a/test/app/net.box.result b/test/box-tap/net.box.result
similarity index 100%
rename from test/app/net.box.result
rename to test/box-tap/net.box.result
diff --git a/test/app/net.box.test.lua b/test/box-tap/net.box.test.lua
similarity index 100%
rename from test/app/net.box.test.lua
rename to test/box-tap/net.box.test.lua
diff --git a/test/app/session.result b/test/box-tap/session.result
similarity index 100%
rename from test/app/session.result
rename to test/box-tap/session.result
diff --git a/test/app/session.test.lua b/test/box-tap/session.test.lua
similarity index 100%
rename from test/app/session.test.lua
rename to test/box-tap/session.test.lua
diff --git a/test/box-tap/suite.ini b/test/box-tap/suite.ini
new file mode 100644
index 0000000000000000000000000000000000000000..c936f4bbd2fd0e6abcf951b85c89b00b877ad9b5
--- /dev/null
+++ b/test/box-tap/suite.ini
@@ -0,0 +1,3 @@
+[default]
+core = app
+description = Database tests with #! using TAP
diff --git a/test/app/trigger_atexit.result b/test/box-tap/trigger_atexit.result
similarity index 100%
rename from test/app/trigger_atexit.result
rename to test/box-tap/trigger_atexit.result
diff --git a/test/app/trigger_atexit.test.lua b/test/box-tap/trigger_atexit.test.lua
similarity index 100%
rename from test/app/trigger_atexit.test.lua
rename to test/box-tap/trigger_atexit.test.lua
diff --git a/test/app/trigger_yield.result b/test/box-tap/trigger_yield.result
similarity index 100%
rename from test/app/trigger_yield.result
rename to test/box-tap/trigger_yield.result
diff --git a/test/app/trigger_yield.test.lua b/test/box-tap/trigger_yield.test.lua
similarity index 100%
rename from test/app/trigger_yield.test.lua
rename to test/box-tap/trigger_yield.test.lua