diff --git a/ydb/tests/functional/tpc/large/test_tpcds.py b/ydb/tests/functional/tpc/large/test_tpcds.py
new file mode 100644
index 000000000000..38e12984ea66
--- /dev/null
+++ b/ydb/tests/functional/tpc/large/test_tpcds.py
@@ -0,0 +1,13 @@
+import ydb.tests.olap.load.lib.tpcds as tpcds
+from ydb.tests.functional.tpc.lib.conftest import FunctionalTestBase
+
+
+class TestTpcdsS1(tpcds.TestTpcds1, FunctionalTestBase):
+    iterations: int = 1
+
+    @classmethod
+    def setup_class(cls) -> None:
+        cls.setup_cluster()
+        cls.run_cli(['workload', 'tpcds', '-p', 'olap_yatests/tpcds/s1', 'init', '--store=column'])
+        cls.run_cli(['workload', 'tpcds', '-p', 'olap_yatests/tpcds/s1', 'import', 'generator', '--scale=1'])
+        tpcds.TestTpcds1.setup_class()
diff --git a/ydb/tests/functional/tpc/large/ya.make b/ydb/tests/functional/tpc/large/ya.make
new file mode 100644
index 000000000000..a08e27220b5d
--- /dev/null
+++ b/ydb/tests/functional/tpc/large/ya.make
@@ -0,0 +1,33 @@
+IF (NOT SANITIZER_TYPE)
+
+PY3TEST()
+ENV(YDB_HARD_MEMORY_LIMIT_BYTES="107374182400")
+
+TEST_SRCS(
+    test_tpcds.py
+)
+
+SIZE(LARGE)
+TAG(ya:fat)
+
+
+REQUIREMENTS(ram:16)
+
+ENV(YDB_ENABLE_COLUMN_TABLES="true")
+ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
+ENV(NO_KUBER_LOGS="yes")
+
+PEERDIR(
+    ydb/tests/functional/tpc/lib
+)
+
+DEPENDS(
+    ydb/apps/ydb
+    ydb/apps/ydbd
+)
+
+FORK_TEST_FILES()
+
+END()
+
+ENDIF()
diff --git a/ydb/tests/functional/tpc/conftest.py b/ydb/tests/functional/tpc/lib/conftest.py
similarity index 100%
rename from ydb/tests/functional/tpc/conftest.py
rename to ydb/tests/functional/tpc/lib/conftest.py
diff --git a/ydb/tests/functional/tpc/lib/ya.make b/ydb/tests/functional/tpc/lib/ya.make
new file mode 100644
index 000000000000..8114678040b7
--- /dev/null
+++ b/ydb/tests/functional/tpc/lib/ya.make
@@ -0,0 +1,12 @@
+PY3_LIBRARY()
+
+    PY_SRCS (
+        conftest.py
+    )
+
+    PEERDIR(
+        ydb/tests/library
+        ydb/tests/olap/load/lib
+    )
+
+END()
diff --git a/ydb/tests/functional/tpc/test_tpch.py b/ydb/tests/functional/tpc/medium/test_tpch.py
similarity index 86%
rename from ydb/tests/functional/tpc/test_tpch.py
rename to ydb/tests/functional/tpc/medium/test_tpch.py
index e18afcb95b76..4dd5f0bf0e9b 100644
--- a/ydb/tests/functional/tpc/test_tpch.py
+++ b/ydb/tests/functional/tpc/medium/test_tpch.py
@@ -1,5 +1,5 @@
 import ydb.tests.olap.load.lib.tpch as tpch
-from conftest import FunctionalTestBase
+from ydb.tests.functional.tpc.lib.conftest import FunctionalTestBase
 
 
 class TestTpchS1(tpch.TestTpch1, FunctionalTestBase):
diff --git a/ydb/tests/functional/tpc/medium/ya.make b/ydb/tests/functional/tpc/medium/ya.make
new file mode 100644
index 000000000000..92000f8718ab
--- /dev/null
+++ b/ydb/tests/functional/tpc/medium/ya.make
@@ -0,0 +1,31 @@
+IF (NOT SANITIZER_TYPE)
+
+PY3TEST()
+ENV(YDB_HARD_MEMORY_LIMIT_BYTES="107374182400")
+
+TEST_SRCS(
+    test_tpch.py
+)
+
+SIZE(MEDIUM)
+
+REQUIREMENTS(ram:16)
+
+ENV(YDB_ENABLE_COLUMN_TABLES="true")
+ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
+ENV(NO_KUBER_LOGS="yes")
+
+PEERDIR(
+    ydb/tests/functional/tpc/lib
+)
+
+DEPENDS(
+    ydb/apps/ydb
+    ydb/apps/ydbd
+)
+
+FORK_TEST_FILES()
+
+END()
+
+ENDIF()
diff --git a/ydb/tests/functional/tpc/ya.make b/ydb/tests/functional/tpc/ya.make
index 7f160560181e..614c7b032285 100644
--- a/ydb/tests/functional/tpc/ya.make
+++ b/ydb/tests/functional/tpc/ya.make
@@ -1,36 +1,5 @@
-IF (NOT SANITIZER_TYPE)
-
-PY3TEST()
-ENV(YDB_HARD_MEMORY_LIMIT_BYTES="107374182400")
-
-PY_SRCS(
-    conftest.py
-)
-
-TEST_SRCS(
-    test_tpch.py
-)
-
-SIZE(MEDIUM)
-
-REQUIREMENTS(ram:16)
-
-ENV(YDB_ENABLE_COLUMN_TABLES="true")
-ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
-ENV(NO_KUBER_LOGS="yes")
-
-PEERDIR(
-    ydb/tests/library
-    ydb/tests/olap/load/lib
-)
-
-DEPENDS(
-    ydb/apps/ydb
-    ydb/apps/ydbd
-)
-
-FORK_TEST_FILES()
-
-END()
-
-ENDIF()
+RECURSE(
+    large
+    lib
+    medium
+)
\ No newline at end of file
diff --git a/ydb/tests/olap/lib/ydb_cli.py b/ydb/tests/olap/lib/ydb_cli.py
index 2161cedcefee..4910d5998429 100644
--- a/ydb/tests/olap/lib/ydb_cli.py
+++ b/ydb/tests/olap/lib/ydb_cli.py
@@ -34,8 +34,7 @@ def get_cli_command() -> list[str]:
         if cli == 'git':
             return [yatest.common.work_path('ydb')] + args
         elif cli == 'main':
-            path = os.path.join(yatest.common.context.project_path, '../../../apps/ydb/ydb')
-            return [yatest.common.binary_path(path)] + args
+            return [yatest.common.binary_path('ydb/apps/ydb/ydb')] + args
         else:
             return [cli] + args