WIP. Solidify SessionActor in KQP UT

23 files changed, 607 insertions, 710 deletions

diff --git a/ydb/core/kqp/ut/common/kqp_ut_common.h b/ydb/core/kqp/ut/common/kqp_ut_common.h
index 87f6c8f9762..48c4e99f71a 100644
--- a/ydb/core/kqp/ut/common/kqp_ut_common.h
+++ b/ydb/core/kqp/ut/common/kqp_ut_common.h
@@ -82,15 +82,10 @@ struct TKikimrSettings: public TTestFeatureFlagsHolder<TKikimrSettings> {
     TKikimrSettings()
     {
         // default value for tests, can be overwritten by SetFeatureFlags()
-        SetEnableKqpSessionActor(false);
+        Y_VERIFY(AppConfig.MutableTableServiceConfig()->GetEnableKqpSessionActor());
         this->SetEnableKqpScanQueryStreamLookup(true);
     }
 
-    TKikimrSettings& SetEnableKqpSessionActor(bool enable) {
-        AppConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(enable);
-        return *this;
-    }
-
     TKikimrSettings& SetAppConfig(const NKikimrConfig::TAppConfig& value) { AppConfig = value; return *this; }
     TKikimrSettings& SetFeatureFlags(const NKikimrConfig::TFeatureFlags& value) { FeatureFlags = value; return *this; }
     TKikimrSettings& SetPQConfig(const NKikimrPQ::TPQConfig& value) { PQConfig = value; return *this; };
@@ -160,12 +155,11 @@ private:
     THolder<NYdb::TDriver> Driver;
 };
 
-inline TKikimrRunner KikimrRunnerEnableSessionActor(bool enable, TVector<NKikimrKqp::TKqpSetting> kqpSettings = {},
+inline TKikimrRunner DefaultKikimrRunner(TVector<NKikimrKqp::TKqpSetting> kqpSettings = {},
     const NKikimrConfig::TAppConfig& appConfig = {})
 {
     auto settings = TKikimrSettings()
         .SetAppConfig(appConfig)
-        .SetEnableKqpSessionActor(enable)
         .SetKqpSettings(kqpSettings);
 
     return TKikimrRunner{settings};
diff --git a/ydb/core/kqp/ut/kqp_explain_ut.cpp b/ydb/core/kqp/ut/kqp_explain_ut.cpp
index 884bea6d2d7..22a5b9dc408 100644
--- a/ydb/core/kqp/ut/kqp_explain_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_explain_ut.cpp
@@ -60,8 +60,8 @@ bool ValidatePlanNodeIds(const NJson::TJsonValue& plan) {
 
 Y_UNIT_TEST_SUITE(KqpExplain) {
 
-    Y_UNIT_TEST_TWIN(Explain, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Explain) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -90,8 +90,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(right.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(ExplainStream, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ExplainStream) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -119,8 +119,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(right.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(ExplainScanQueryWithParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ExplainScanQueryWithParams) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -135,8 +135,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_C(it.IsSuccess(), it.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(AggGroupLimit, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(AggGroupLimit) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -169,8 +169,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
             "{_yql_agg_0: MIN(item.Message),_yql_agg_1: MAX(item.Message)}");
     }
 
-    Y_UNIT_TEST_TWIN(ComplexJoin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ComplexJoin) {
+        auto kikimr = DefaultKikimrRunner();
         CreateSampleTables(kikimr);
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
@@ -211,8 +211,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(right.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(PrecomputeRange, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PrecomputeRange) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -240,8 +240,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(readRanges[0] == "Key [150, 266]");
     }
 
-    Y_UNIT_TEST_TWIN(CompoundKeyRange, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(CompoundKeyRange) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -269,8 +269,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(lookup.at("ReadRange").GetArraySafe()[0] == "App (new_app_1)");
     }
 
-    Y_UNIT_TEST_TWIN(SortStage, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SortStage) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -292,8 +292,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(scanSort.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(LimitOffset, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LimitOffset) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -317,8 +317,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(offset.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(SelfJoin3xSameLabels, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SelfJoin3xSameLabels) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -353,8 +353,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(join2.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(PureExpr, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PureExpr) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
@@ -376,12 +376,12 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(constExpr.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(MultiUsedStage, UseSessionActor) {
+    Y_UNIT_TEST(MultiUsedStage) {
         NKikimrConfig::TAppConfig appCfg;
         auto* spilling = appCfg.MutableTableServiceConfig()->MutableSpillingServiceConfig()->MutableLocalFileConfig();
         spilling->SetEnable(true);
         spilling->SetRoot("./spilling/");
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, appCfg);
+        auto kikimr = DefaultKikimrRunner({}, appCfg);
 
         auto db = kikimr.GetTableClient();
         TStreamExecScanQuerySettings settings;
@@ -413,8 +413,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(containCte);
     }
 
-    Y_UNIT_TEST_TWIN(SqlIn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SqlIn) {
+        auto kikimr = DefaultKikimrRunner();
         CreateSampleTables(kikimr);
 
         TStreamExecScanQuerySettings settings;
@@ -441,8 +441,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_EQUAL(unionNode.GetMap().at("Plans").GetArraySafe().size(), 4);
     }
 
-    Y_UNIT_TEST_TWIN(ExplainDataQueryOldEngine, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ExplainDataQueryOldEngine) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -458,8 +458,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_EQUAL(plan.GetMapSafe().at("tables").GetArraySafe()[0].GetMapSafe().at("name").GetStringSafe(), "/Root/KeyValue");
     }
 
-    Y_UNIT_TEST_TWIN(ExplainDataQueryNewEngine, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ExplainDataQueryNewEngine) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -484,8 +484,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_EQUAL(node.GetMapSafe().at("Table").GetStringSafe(), "KeyValue");
     }
 
-    Y_UNIT_TEST_TWIN(FewEffects, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(FewEffects) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -538,8 +538,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_VALUES_EQUAL(counter["Lookup"], lookupsCount);
     }
 
-    Y_UNIT_TEST_TWIN(ExplainDataQueryWithParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ExplainDataQueryWithParams) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -556,8 +556,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT_VALUES_EQUAL_C(result2.GetStatus(), EStatus::SUCCESS, result2.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(FullOuterJoin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(FullOuterJoin) {
+        auto kikimr = DefaultKikimrRunner();
         CreateSampleTables(kikimr);
 
         TStreamExecScanQuerySettings settings;
@@ -586,8 +586,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(right.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(ReadTableRangesFullScan, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ReadTableRangesFullScan) {
+        auto kikimr = DefaultKikimrRunner();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
         auto db = kikimr.GetTableClient();
@@ -650,8 +650,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(ReadTableRanges, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ReadTableRanges) {
+        auto kikimr = DefaultKikimrRunner();
         CreateSampleTables(kikimr);
 
         TStreamExecScanQuerySettings settings;
@@ -679,8 +679,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         UNIT_ASSERT(count.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(Predicates, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Predicates) {
+        auto kikimr = DefaultKikimrRunner();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
 
@@ -749,8 +749,8 @@ Y_UNIT_TEST_SUITE(KqpExplain) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(MergeConnection, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MergeConnection) {
+        auto kikimr = DefaultKikimrRunner();
         TStreamExecScanQuerySettings settings;
         settings.Explain(true);
 
diff --git a/ydb/core/kqp/ut/kqp_limits_ut.cpp b/ydb/core/kqp/ut/kqp_limits_ut.cpp
index 049a0854f17..75839354bb1 100644
--- a/ydb/core/kqp/ut/kqp_limits_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_limits_ut.cpp
@@ -66,7 +66,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
     Y_UNIT_TEST(DatashardProgramSize) {
         auto app = NKikimrConfig::TAppConfig();
         app.MutableTableServiceConfig()->MutableResourceManager()->SetMkqlLightProgramMemoryLimit(1'000'000'000);
-        app.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
 
         TKikimrRunner kikimr(app);
         CreateLargeTable(kikimr, 0, 0, 0);
@@ -103,7 +102,8 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
             SELECT * FROM AS_TABLE($rows);
         )"), TTxControl::BeginTx().CommitTx(), paramsBuilder.Build()).ExtractValueSync();
         result.GetIssues().PrintTo(Cerr);
-        UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
+        // UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::PRECONDITION_FAILED);
+        UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::ABORTED);
         UNIT_ASSERT(HasIssue(result.GetIssues(), NKikimrIssues::TIssuesIds::SHARD_PROGRAM_SIZE_EXCEEDED));
     }
 
@@ -111,7 +111,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
         auto app = NKikimrConfig::TAppConfig();
         auto& queryLimits = *app.MutableTableServiceConfig()->MutableQueryLimits();
         queryLimits.MutablePhaseLimits()->SetComputeNodeMemoryLimitBytes(1'000'000'000);
-        app.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
         TKikimrRunner kikimr(app);
         CreateLargeTable(kikimr, 100, 10, 1'000'000, 1, 2);
 
@@ -141,7 +140,7 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
             SELECT * FROM `/Root/LargeTable`;
         )"), TTxControl::BeginTx().CommitTx()).ExtractValueSync();
         result.GetIssues().PrintTo(Cerr);
-        UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::UNDETERMINED);
+        UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::PRECONDITION_FAILED);
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_RESULT_UNAVAILABLE));
     }
 
@@ -149,7 +148,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
         auto app = NKikimrConfig::TAppConfig();
         app.MutableTableServiceConfig()->MutableResourceManager()->SetMkqlLightProgramMemoryLimit(1'000'000'000);
         app.MutableTableServiceConfig()->SetCompileTimeoutMs(TDuration::Minutes(5).MilliSeconds());
-        app.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
 
         TKikimrRunner kikimr(app);
         CreateLargeTable(kikimr, 0, 0, 0);
@@ -182,7 +180,8 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
 
         auto result = session.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx()).ExtractValueSync();
         result.GetIssues().PrintTo(Cerr);
-        UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
+        //UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::PRECONDITION_FAILED, result.GetIssues().ToString());
+        UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
         UNIT_ASSERT(HasIssue(result.GetIssues(), NKikimrIssues::TIssuesIds::SHARD_PROGRAM_SIZE_EXCEEDED));
     }
 
@@ -292,7 +291,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
         NKikimrConfig::TAppConfig appConfig;
         auto& queryLimits = *appConfig.MutableTableServiceConfig()->MutableQueryLimits();
         queryLimits.MutablePhaseLimits()->SetAffectedShardsLimit(20);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
 
         TKikimrRunner kikimr(appConfig);
 
@@ -334,7 +332,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
         NKikimrConfig::TAppConfig appConfig;
         auto& queryLimits = *appConfig.MutableTableServiceConfig()->MutableQueryLimits();
         queryLimits.MutablePhaseLimits()->SetReadsetCountLimit(50);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
 
         TKikimrRunner kikimr(appConfig);
         CreateLargeTable(kikimr, 10, 10, 100);
@@ -367,8 +364,7 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
 
         auto serverSettings = TKikimrSettings()
             .SetAppConfig(appConfig)
-            .SetEnableMvccSnapshotReads(false)
-            .SetEnableKqpSessionActor(false);
+            .SetEnableMvccSnapshotReads(false);
 
         TKikimrRunner kikimr(serverSettings);
         CreateLargeTable(kikimr, 20, 10, 1'000'000, 1);
@@ -400,7 +396,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
         appConfig.MutableTableServiceConfig()->MutableResourceManager()->SetMkqlLightProgramMemoryLimit(1'000'000'000);
         auto& queryLimits = *appConfig.MutableTableServiceConfig()->MutableQueryLimits();
         queryLimits.MutablePhaseLimits()->SetComputeNodeMemoryLimitBytes(100'000'000);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
 
         TKikimrRunner kikimr(appConfig);
 
@@ -449,7 +444,6 @@ Y_UNIT_TEST_SUITE(KqpLimits) {
     Y_UNIT_TEST(QueryExecTimeout) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->MutableResourceManager()->SetMkqlLightProgramMemoryLimit(10'000'000'000);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(false);
 
         TKikimrRunner kikimr(appConfig);
 
diff --git a/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp b/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
index 7991512f5ef..5ceb9149976 100644
--- a/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_ne_effects_ut.cpp
@@ -9,8 +9,8 @@ using namespace NYdb;
 using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
-    Y_UNIT_TEST_TWIN(InsertAbort_Literal_Success, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Literal_Success) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -31,8 +31,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Literal_Duplicates, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Literal_Duplicates) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -53,8 +53,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         CompareYson(R"([])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Literal_Conflict, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Literal_Conflict) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -77,8 +77,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Params_Success, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Params_Success) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -114,8 +114,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Params_Duplicates, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Params_Duplicates) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -158,8 +158,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Params_Conflict, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Params_Conflict) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -197,8 +197,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Select_Success, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Select_Success) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -234,8 +234,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Select_Duplicates, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Select_Duplicates) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -274,8 +274,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertAbort_Select_Conflict, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertAbort_Select_Conflict) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -313,8 +313,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertRevert_Literal_Success, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertRevert_Literal_Success) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -335,8 +335,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertRevert_Literal_Duplicates, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertRevert_Literal_Duplicates) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -355,8 +355,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         CompareYson(R"([])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertRevert_Literal_Conflict, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertRevert_Literal_Conflict) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -377,8 +377,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(UpdateOn_Literal, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdateOn_Literal) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -404,8 +404,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(UpdateOn_Params, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdateOn_Params) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -445,8 +445,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(UpdateOn_Select, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdateOn_Select) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -476,8 +476,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngineEffects) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(DeletePkPrefixWithIndex, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeletePkPrefixWithIndex) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp b/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
index 46e107c2408..45a675b0abf 100644
--- a/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_ne_flowcontrol_ut.cpp
@@ -49,7 +49,7 @@ void CreateSampleTables(TKikimrRunner& kikimr) {
 
 Y_UNIT_TEST_SUITE(KqpFlowControl) {
 
-void DoFlowControlTest(ui64 limit, bool hasBlockedByCapacity, bool useSessionActor) {
+void DoFlowControlTest(ui64 limit, bool hasBlockedByCapacity) {
     NKikimrConfig::TAppConfig appCfg;
     appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetChannelBufferSize(limit);
     appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetMinChannelBufferSize(limit);
@@ -59,7 +59,6 @@ void DoFlowControlTest(ui64 limit, bool hasBlockedByCapacity, bool useSessionAct
     // TODO: KIKIMR-14294
     auto kikimrSettings = TKikimrSettings()
         .SetAppConfig(appCfg)
-        .SetEnableKqpSessionActor(useSessionActor)
         .SetKqpSettings({})
         .SetEnableKqpScanQueryStreamLookup(false);
     TKikimrRunner kikimr{kikimrSettings};
@@ -111,16 +110,16 @@ void DoFlowControlTest(ui64 limit, bool hasBlockedByCapacity, bool useSessionAct
     UNIT_ASSERT_EQUAL(hasBlockedByCapacity, writesBlockedNoSpace > 0);
 }
 
-Y_UNIT_TEST_TWIN(FlowControl_Unlimited, UseSessionActor) {
-    DoFlowControlTest(100ul << 20, false, UseSessionActor);
+Y_UNIT_TEST(FlowControl_Unlimited) {
+    DoFlowControlTest(100ul << 20, false);
 }
 
-Y_UNIT_TEST_TWIN(FlowControl_BigLimit, UseSessionActor) {
-    DoFlowControlTest(1ul << 10, false, UseSessionActor);
+Y_UNIT_TEST(FlowControl_BigLimit) {
+    DoFlowControlTest(1ul << 10, false);
 }
 
-Y_UNIT_TEST_TWIN(FlowControl_SmallLimit, UseSessionActor) {
-    DoFlowControlTest(1ul, true, UseSessionActor);
+Y_UNIT_TEST(FlowControl_SmallLimit) {
+    DoFlowControlTest(1ul, true);
 }
 
 //Y_UNIT_TEST(SlowClient) {
diff --git a/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp b/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
index 8ee0d203480..5389d273cca 100644
--- a/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_ne_perf_ut.cpp
@@ -120,8 +120,8 @@ TParams BuildInsertIndexParams(TTableClient& client) {
 } // namespace
 
 Y_UNIT_TEST_SUITE(KqpPerf) {
-    Y_UNIT_TEST_TWIN(Upsert, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Upsert) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -153,8 +153,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(Replace, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Replace) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -186,8 +186,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(UpdateOn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdateOn) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -219,8 +219,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(Insert, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Insert) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -252,8 +252,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(DeleteOn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeleteOn) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -285,8 +285,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(Update, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Update) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -320,8 +320,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(Delete, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Delete) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -356,8 +356,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(IndexUpsert, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IndexUpsert) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTablesWithIndex(session);
@@ -379,8 +379,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 4);
     }
 
-    Y_UNIT_TEST_TWIN(IndexReplace, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IndexReplace) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTablesWithIndex(session);
@@ -402,8 +402,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 4);
     }
 
-    Y_UNIT_TEST_TWIN(IndexUpdateOn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IndexUpdateOn) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTablesWithIndex(session);
@@ -425,8 +425,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 4);
     }
 
-    Y_UNIT_TEST_TWIN(IndexDeleteOn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IndexDeleteOn) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTablesWithIndex(session);
@@ -448,8 +448,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 4);
     }
 
-    Y_UNIT_TEST_TWIN(IndexInsert, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IndexInsert) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTablesWithIndex(session);
@@ -471,8 +471,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 5);
     }
 
-    Y_UNIT_TEST_TWIN(IdxLookupJoin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IdxLookupJoin) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -497,8 +497,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 3);
     }
 
-    Y_UNIT_TEST_TWIN(IdxLookupJoinThreeWay, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IdxLookupJoinThreeWay) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -524,8 +524,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 5);
     }
 
-    Y_UNIT_TEST_TWIN(ComputeLength, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ComputeLength) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -542,8 +542,8 @@ Y_UNIT_TEST_SUITE(KqpPerf) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 1);
     }
 
-    Y_UNIT_TEST_TWIN(AggregateToScalar, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(AggregateToScalar) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_ne_ut.cpp b/ydb/core/kqp/ut/kqp_ne_ut.cpp
index 833e9b6888d..d8f73e4c57f 100644
--- a/ydb/core/kqp/ut/kqp_ne_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_ne_ut.cpp
@@ -8,9 +8,8 @@ using namespace NYdb;
 using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpNewEngine) {
-    Y_UNIT_TEST_TWIN(Select1, UseSessionActor) {
+    Y_UNIT_TEST(Select1) {
         auto settings = TKikimrSettings()
-            .SetEnableKqpSessionActor(UseSessionActor)
             .SetWithSampleTables(false);
         auto kikimr = TKikimrRunner{settings};
         auto db = kikimr.GetTableClient();
@@ -26,9 +25,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(SimpleUpsertSelect, UseSessionActor) {
+    Y_UNIT_TEST(SimpleUpsertSelect) {
         auto settings = TKikimrSettings()
-            .SetEnableKqpSessionActor(UseSessionActor)
             .SetWithSampleTables(false);
         auto kikimr = TKikimrRunner{settings};
         auto db = kikimr.GetTableClient();
@@ -66,8 +64,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(selectResult.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PkSelect1, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PkSelect1) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -120,8 +118,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_VALUES_EQUAL(1, stats.query_phases()[0].table_access()[0].partitions_count());
     }
 
-    Y_UNIT_TEST_TWIN(PkSelect2, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PkSelect2) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -158,8 +156,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PkRangeSelect1, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PkRangeSelect1) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -191,8 +189,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PkRangeSelect2, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PkRangeSelect2) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -225,8 +223,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PkRangeSelect3, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PkRangeSelect3) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -255,8 +253,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PkRangeSelect4, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PkRangeSelect4) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -282,8 +280,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(MultiSelect, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiSelect) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -313,8 +311,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(MultiOutput, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiOutput) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -337,8 +335,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(1)));
     }
 
-    Y_UNIT_TEST_TWIN(InShardsWrite, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InShardsWrite) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -365,8 +363,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(ShuffleWrite, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ShuffleWrite) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -393,8 +391,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(KeyColumnOrder, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(KeyColumnOrder) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         // Please do not change the name of columns here
@@ -439,8 +437,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(KeyColumnOrder2, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(KeyColumnOrder2) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         {
@@ -470,8 +468,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(BlindWrite, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BlindWrite) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -495,8 +493,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(BlindWriteParameters, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BlindWriteParameters) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -542,8 +540,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(BlindWriteListParameter, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BlindWriteListParameter) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -589,8 +587,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(BatchUpload, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BatchUpload) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -668,8 +666,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
     }
 
 #if !defined(_ubsan_enabled_)
-    Y_UNIT_TEST_TWIN(Aggregate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Aggregate) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         auto result = session.ExecuteDataQuery(R"(
@@ -683,8 +681,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateTuple, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(AggregateTuple) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         auto result = session.ExecuteDataQuery(R"(
@@ -701,8 +699,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
     }
 #endif
 
-    Y_UNIT_TEST_TWIN(PureExpr, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PureExpr) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -720,8 +718,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(stats.query_phases(0).table_access().size() == 0);
     }
 
-    Y_UNIT_TEST_TWIN(MultiStatement, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiStatement) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -743,8 +741,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(stats.query_phases(0).table_access().size() == 0);
     }
 
-    Y_UNIT_TEST_TWIN(MultiStatementMixPure, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiStatementMixPure) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         auto result = session.ExecuteDataQuery(R"(
@@ -760,8 +758,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[[101u]]])", FormatResultSetYson(result.GetResultSet(3)));
     }
 
-    Y_UNIT_TEST_TWIN(LocksSingleShard, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksSingleShard) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session1 = db.CreateSession().GetValueSync().GetSession();
 
@@ -792,8 +790,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(LocksMultiShard, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksMultiShard) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session1 = db.CreateSession().GetValueSync().GetSession();
 
@@ -824,8 +822,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(LocksMultiShardOk, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksMultiShardOk) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -842,8 +840,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         AssertSuccessResult(result);
     }
 
-    Y_UNIT_TEST_TWIN(LocksEffects, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksEffects) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session1 = db.CreateSession().GetValueSync().GetSession();
 
@@ -877,8 +875,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
             FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(LocksNoMutations, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksNoMutations) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -897,8 +895,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[42]])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(LocksNoMutationsSharded, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksNoMutationsSharded) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -917,8 +915,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[42]])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(BrokenLocksAtROTx, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BrokenLocksAtROTx) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -951,8 +949,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(BrokenLocksAtROTxSharded, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BrokenLocksAtROTxSharded) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -985,8 +983,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(BrokenLocksOnUpdate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(BrokenLocksOnUpdate) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1021,8 +1019,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(DeferredEffects, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeferredEffects) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1082,9 +1080,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PureTxMixedWithDeferred, UseSessionActor) {
-        auto settings = TKikimrSettings()
-            .SetEnableKqpSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PureTxMixedWithDeferred) {
+        auto settings = TKikimrSettings();
         auto kikimr = TKikimrRunner{settings};
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
@@ -1106,8 +1103,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PrunePartitionsByLiteral, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PrunePartitionsByLiteral) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1135,8 +1132,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(stats.query_phases(0).duration_us() > 0);
     }
 
-    Y_UNIT_TEST_TWIN(PrunePartitionsByExpr, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PrunePartitionsByExpr) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1172,8 +1169,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(stats.query_phases(1).duration_us() > 0);
     }
 
-    Y_UNIT_TEST_TWIN(PruneWritePartitions, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PruneWritePartitions) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1215,14 +1212,14 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(Truncated, UseSessionActor) {
+    Y_UNIT_TEST(Truncated) {
         TVector<NKikimrKqp::TKqpSetting> settings;
         NKikimrKqp::TKqpSetting setting;
         setting.SetName("_ResultRowsLimit");
         setting.SetValue("5");
         settings.push_back(setting);
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, settings);
+        auto kikimr = DefaultKikimrRunner(settings);
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1236,8 +1233,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(result.GetResultSet(0).Truncated());
     }
 
-    Y_UNIT_TEST_TWIN(Replace, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Replace) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1290,8 +1287,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_C(!result.IsSuccess(), result.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(Join, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Join) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1313,8 +1310,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinWithParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinWithParams) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1344,8 +1341,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinIdxLookup, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinIdxLookup) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1390,8 +1387,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(2).table_access(0).reads().rows(), 4);
     }
 
-    Y_UNIT_TEST_TWIN(LeftSemiJoin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LeftSemiJoin) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1425,8 +1422,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinPure, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinPure) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1471,8 +1468,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinPureUncomparableKeys, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinPureUncomparableKeys) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1494,8 +1491,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(SelfJoin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SelfJoin) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1513,8 +1510,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(Update, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Update) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1557,8 +1554,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(Delete, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Delete) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1601,8 +1598,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(DeleteOn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeleteOn) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1645,8 +1642,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(MultiEffects, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiEffects) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1678,8 +1675,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
             ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(UpdateFromParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdateFromParams) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1725,8 +1722,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
             ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(PruneEffectPartitions, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PruneEffectPartitions) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1778,8 +1775,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(it.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(DecimalColumn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DecimalColumn) {
+        auto kikimr = DefaultKikimrRunner();
 
         TTableClient client{kikimr.GetDriver()};
         auto session = client.CreateSession().GetValueSync().GetSession();
@@ -1821,8 +1818,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
             ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(LocksInRoTx, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksInRoTx) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
 
         auto session = db.CreateSession().GetValueSync().GetSession();
@@ -1846,8 +1843,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_C(ret.IsSuccess(), ret.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(ItemsLimit, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ItemsLimit) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1920,8 +1917,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
 //        )");
     }
 
-    Y_UNIT_TEST_TWIN(OnlineRO_Consistent, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(OnlineRO_Consistent) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1942,8 +1939,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(OnlineRO_Inconsistent, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(OnlineRO_Inconsistent) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1965,8 +1962,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(StaleRO, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(StaleRO) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2053,8 +2050,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(StaleRO_Immediate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(StaleRO_Immediate) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2075,8 +2072,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         )", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(ReadRangeWithParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ReadRangeWithParams) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2093,8 +2090,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(range.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(Nondeterministic, UseSessionActor) { // TODO: KIKIMR-4759
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Nondeterministic) { // TODO: KIKIMR-4759
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2117,8 +2114,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_VALUES_EQUAL(result.GetResultSet(0).RowsCount(), 1);
     }
 
-    Y_UNIT_TEST_TWIN(ScalarFunctions, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ScalarFunctions) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2302,8 +2299,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(DeleteWithBuiltin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeleteWithBuiltin) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2319,8 +2316,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_EQUAL(stats.query_phases().size(), 2);
     }
 
-    Y_UNIT_TEST_TWIN(MultiEffectsOnSameTable, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiEffectsOnSameTable) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2345,8 +2342,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson("[[[100500u];[100]]]", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(MultiUsagePrecompute, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MultiUsagePrecompute) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2372,8 +2369,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson("[[[1]];[[1]];[[1]];[[2]];[[2]]]", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(SqlInFromCompact, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SqlInFromCompact) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2433,8 +2430,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(PrecomputeKey, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(PrecomputeKey) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2454,8 +2451,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[["Value21"]]])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(UnionAllPure, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UnionAllPure) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2482,8 +2479,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinWithPrecompute, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinWithPrecompute) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2514,8 +2511,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[106u;[101u];["One"]]])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinProjectMulti, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinProjectMulti) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2538,8 +2535,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinMultiConsumer, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinMultiConsumer) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2585,8 +2582,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(UpsertEmptyInput, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpsertEmptyInput) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2619,8 +2616,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(DeleteByKey, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeleteByKey) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2714,8 +2711,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(DeleteWithInputMultiConsumption, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeleteWithInputMultiConsumption) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2758,8 +2755,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(DeleteWithInputMultiConsumptionLimit, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DeleteWithInputMultiConsumptionLimit) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2796,8 +2793,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
     }
 
     // https://st.yandex-team.ru/KIKIMR-14022
-    Y_UNIT_TEST_TWIN(JoinSameKey, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinSameKey) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2817,8 +2814,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(JoinDictWithPure, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(JoinDictWithPure) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2839,8 +2836,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(AsyncIndexUpdate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(AsyncIndexUpdate) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2865,8 +2862,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(DuplicatedResults, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DuplicatedResults) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2887,8 +2884,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[[3500u];["None"];[1u];["Anna"]];[[300u];["None"];[1u];["Paul"]];[[7200u];["None"];[2u];["Tony"]]])", FormatResultSetYson(result.GetResultSet(4)));
     }
 
-    Y_UNIT_TEST_TWIN(LookupColumns, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LookupColumns) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2913,8 +2910,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(OrderedScalarContext, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(OrderedScalarContext) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2927,8 +2924,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         CompareYson(R"([[2u]])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(LiteralKeys, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LiteralKeys) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2971,8 +2968,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_VALUES_EQUAL("/Root/Logs", stats.query_phases()[0].table_access()[0].name());
     }
 
-    Y_UNIT_TEST_TWIN(ReadDifferentColumns, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ReadDifferentColumns) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2991,8 +2988,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT_VALUES_EQUAL(reads[0]["columns"].GetArraySafe().size(), 3);
     }
 
-    Y_UNIT_TEST_TWIN(ReadDifferentColumnsPk, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ReadDifferentColumnsPk) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -3015,8 +3012,8 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
         UNIT_ASSERT(readTypes.contains("Lookup"));
     }
 
-    Y_UNIT_TEST_TWIN(DependentSelect, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DependentSelect) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_olap_ut.cpp b/ydb/core/kqp/ut/kqp_olap_ut.cpp
index 408f1fad598..23379eef9aa 100644
--- a/ydb/core/kqp/ut/kqp_olap_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_olap_ut.cpp
@@ -488,10 +488,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(SimpleQueryOlap, UseSessionActor) {
+    Y_UNIT_TEST(SimpleQueryOlap) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         // EnableDebugLogging(kikimr);
@@ -520,10 +519,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(SimpleLookupOlap, UseSessionActor) {
+    Y_UNIT_TEST(SimpleLookupOlap) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         // EnableDebugLogging(kikimr);
@@ -551,10 +549,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(SimpleRangeOlap, UseSessionActor) {
+    Y_UNIT_TEST(SimpleRangeOlap) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         // EnableDebugLogging(kikimr);
@@ -583,10 +580,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(CompositeRangeOlap, UseSessionActor) {
+    Y_UNIT_TEST(CompositeRangeOlap) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         // EnableDebugLogging(kikimr);
@@ -742,10 +738,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         session.Close();
     }
 
-    Y_UNIT_TEST_TWIN(QueryOltpAndOlap, UseSessionActor) {
+    Y_UNIT_TEST(QueryOltpAndOlap) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         // EnableDebugLogging(kikimr);
@@ -775,10 +770,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(EmptyRange, UseSessionActor) {
+    Y_UNIT_TEST(EmptyRange) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TLocalHelper(kikimr).CreateTestOlapTable();
@@ -798,10 +792,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         CompareYson(StreamResultToYson(it), "[]");
     }
 
-    Y_UNIT_TEST_TWIN(Aggregation, UseSessionActor) {
+    Y_UNIT_TEST(Aggregation) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         // EnableDebugLogging(kikimr);
@@ -872,13 +865,12 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(PushdownFilter, UseSessionActor) {
+    Y_UNIT_TEST(PushdownFilter) {
         static bool enableLog = false;
 
         auto doTest = [](std::optional<bool> viaSettings, std::optional<bool> viaPragma, bool pushdownPresent) {
             auto settings = TKikimrSettings()
-                .SetWithSampleTables(false)
-                .SetEnableKqpSessionActor(UseSessionActor);
+                .SetWithSampleTables(false);
 
             if (enableLog) {
                 Cerr << "Run test:" << Endl;
@@ -971,10 +963,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(PKDescScan, UseSessionActor) {
+    Y_UNIT_TEST(PKDescScan) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TStreamExecScanQuerySettings scanSettings;
@@ -1047,10 +1038,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         CompareYson(expectedYson, ysonResult);
     }
 
-    Y_UNIT_TEST_TWIN(ExtractRanges, UseSessionActor) {
+    Y_UNIT_TEST(ExtractRanges) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TLocalHelper(kikimr).CreateTestOlapTable();
@@ -1079,10 +1069,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         UNIT_ASSERT(rows.size() == 6);
     }
 
-    Y_UNIT_TEST_TWIN(ExtractRangesReverse, UseSessionActor) {
+    Y_UNIT_TEST(ExtractRangesReverse) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TLocalHelper(kikimr).CreateTestOlapTable();
@@ -1124,11 +1113,10 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         UNIT_ASSERT(rows.size() == expectedCount);
     }
 
-    Y_UNIT_TEST_TWIN(PredicatePushdown, UseSessionActor) {
+    Y_UNIT_TEST(PredicatePushdown) {
         constexpr bool logQueries = false;
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TStreamExecScanQuerySettings scanSettings;
@@ -1855,10 +1843,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         TestAggregations({ testCase });
     }
 
-    Y_UNIT_TEST_TWIN(StatsSysView, UseSessionActor) {
+    Y_UNIT_TEST(StatsSysView) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
 
@@ -1897,10 +1884,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
             0.3*0.9*100*1000); // >= 90% of 100K inserted rows
     }
 
-    Y_UNIT_TEST_TWIN(StatsSysViewTable, UseSessionActor) {
+    Y_UNIT_TEST(StatsSysViewTable) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
 
@@ -2360,10 +2346,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         UNIT_ASSERT_VALUES_EQUAL(result, insertRows);
     }
 
-    Y_UNIT_TEST_TWIN(StatsSysViewColumns, UseSessionActor) {
+    Y_UNIT_TEST(StatsSysViewColumns) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
 
@@ -2421,10 +2406,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(StatsSysViewRanges, UseSessionActor) {
+    Y_UNIT_TEST(StatsSysViewRanges) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
 
@@ -2507,10 +2491,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(StatsSysViewFilter, UseSessionActor) {
+    Y_UNIT_TEST(StatsSysViewFilter) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TLocalHelper(kikimr.GetTestServer()).CreateTestOlapTable();
@@ -2581,10 +2564,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(StatsSysViewAggregation, UseSessionActor) {
+    Y_UNIT_TEST(StatsSysViewAggregation) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
         static ui32 numKinds = 5;
 
@@ -2758,11 +2740,10 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(PredicatePushdownWithParameters, UseSessionActor) {
+    Y_UNIT_TEST(PredicatePushdownWithParameters) {
         constexpr bool logQueries = true;
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TStreamExecScanQuerySettings scanSettings;
@@ -2843,10 +2824,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         UNIT_ASSERT(readRange.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(PredicatePushdownParameterTypesValidation, UseSessionActor) {
+    Y_UNIT_TEST(PredicatePushdownParameterTypesValidation) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TStreamExecScanQuerySettings scanSettings;
@@ -2900,10 +2880,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(PredicatePushdownCastErrors, UseSessionActor) {
+    Y_UNIT_TEST(PredicatePushdownCastErrors) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
         TKikimrRunner kikimr(settings);
 
         TStreamExecScanQuerySettings scanSettings;
diff --git a/ydb/core/kqp/ut/kqp_params_ut.cpp b/ydb/core/kqp/ut/kqp_params_ut.cpp
index 5cd2e1ea861..8e41e15aafe 100644
--- a/ydb/core/kqp/ut/kqp_params_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_params_ut.cpp
@@ -274,8 +274,8 @@ Y_UNIT_TEST_SUITE(KqpParams) {
         UNIT_ASSERT_C(actual == expected1 || actual == expected2, "expected: " << expected1 << ", got: " << actual);
     }
 
-    Y_UNIT_TEST_TWIN(InvalidJson, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InvalidJson) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_query_ut.cpp b/ydb/core/kqp/ut/kqp_query_ut.cpp
index 589b1b515db..005ae38dc8e 100644
--- a/ydb/core/kqp/ut/kqp_query_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_query_ut.cpp
@@ -86,7 +86,6 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
     Y_UNIT_TEST(QueryCacheTtl) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetCompileQueryCacheTTLSec(2);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(true);
 
         TKikimrRunner kikimr(appConfig);
         auto db = kikimr.GetTableClient();
@@ -970,7 +969,6 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
 
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->MutableQueryLimits()->SetResultRowsLimit(6);
-        appConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(true);
 
         TKikimrRunner kikimr(appConfig, {setting});
         auto db = kikimr.GetTableClient();
diff --git a/ydb/core/kqp/ut/kqp_scan_ut.cpp b/ydb/core/kqp/ut/kqp_scan_ut.cpp
index d060c153b52..029c9010d86 100644
--- a/ydb/core/kqp/ut/kqp_scan_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_scan_ut.cpp
@@ -95,8 +95,8 @@ void CreateNullSampleTables(TKikimrRunner& kikimr) {
 } // namespace
 
 Y_UNIT_TEST_SUITE(KqpScan) {
-    Y_UNIT_TEST_TWIN(IsNull, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IsNull) {
+        auto kikimr = DefaultKikimrRunner();
         CreateNullSampleTables(kikimr);
 
         auto it = kikimr.GetTableClient().StreamExecuteScanQuery(R"(
@@ -108,8 +108,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[["One"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(IsNullPartial, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(IsNullPartial) {
+        auto kikimr = DefaultKikimrRunner();
         CreateNullSampleTables(kikimr);
 
         auto it = kikimr.GetTableClient().StreamExecuteScanQuery(R"(
@@ -121,8 +121,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(NullInKey, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(NullInKey) {
+        auto kikimr = DefaultKikimrRunner();
         CreateNullSampleTables(kikimr);
 
         auto it = kikimr.GetTableClient().StreamExecuteScanQuery(R"(
@@ -135,8 +135,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[["Five"]];[["Four"]];[["Six"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(NullInKeySuffix, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(NullInKeySuffix) {
+        auto kikimr = DefaultKikimrRunner();
         CreateNullSampleTables(kikimr);
 
         auto it = kikimr.GetTableClient().StreamExecuteScanQuery(R"(
@@ -151,9 +151,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(DecimalColumn, UseSessionActor) {
-        //auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(DecimalColumn) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
 
         TTableClient client{kikimr.GetDriver()};
         auto session = client.CreateSession().GetValueSync().GetSession();
@@ -199,8 +198,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Offset, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Offset) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -215,8 +214,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Limit, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Limit) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -227,8 +226,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[1u];["One"]];[[2u];["Two"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(TopSort, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(TopSort) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -239,8 +238,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[1u];["One"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Grep, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Grep) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -260,8 +259,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             [[1];[802u];["Value2"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(GrepByString, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(GrepByString) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -275,8 +274,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             [["ydb"];["ydb-1000"];["some very very very very long string"];[0]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Order, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Order) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = db.GetParamsBuilder()
@@ -302,8 +301,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(GrepRange, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(GrepRange) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = db.GetParamsBuilder()
@@ -332,8 +331,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(GrepLimit, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(GrepLimit) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = db.GetParamsBuilder()
@@ -370,8 +369,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(GrepNonKeyColumns, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(GrepNonKeyColumns) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         TParamsBuilder params;
@@ -404,8 +403,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(SingleKey, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(SingleKey) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = db.GetParamsBuilder()
@@ -427,8 +426,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateByColumn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateByColumn) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -446,8 +445,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateNoColumn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateNoColumn) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -461,8 +460,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[36];[2.];18u;[3];[1];[19980u]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateNoColumnNoRemaps, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateNoColumnNoRemaps) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -476,8 +475,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[36];[2.];18u]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateWithFunction, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateWithFunction) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -490,8 +489,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[436]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateCountStar, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateCountStar) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery("SELECT COUNT(*) FROM `/Root/EightShard`").GetValueSync();
@@ -499,8 +498,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[24u]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateEmptyCountStar, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateEmptyCountStar) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery("SELECT COUNT(*) FROM `/Root/EightShard` WHERE Key < 10").GetValueSync();
@@ -508,8 +507,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[0u]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(AggregateEmptySum, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(AggregateEmptySum) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery("SELECT SUM(Data) FROM `/Root/EightShard` WHERE Key < 10").GetValueSync();
@@ -517,8 +516,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[#]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(JoinSimple, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(JoinSimple) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -540,8 +539,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Join, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Join) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -568,8 +567,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         test(false);
     }
 
-    Y_UNIT_TEST_TWIN(Join2, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Join2) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -591,8 +590,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Join3, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Join3) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -625,8 +624,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         test(false);
     }
 
-    Y_UNIT_TEST_TWIN(Join4, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Join4) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTables(kikimr);
@@ -667,8 +666,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(LeftSemiJoinSimple, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(LeftSemiJoinSimple) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -689,8 +688,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             [[302u];["Value-302"];["302"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(RightJoinSimple, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(RightJoinSimple) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -711,8 +710,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         )", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(RightOnlyJoinSimple, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(RightOnlyJoinSimple) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -731,8 +730,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(RightSemiJoinSimple, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(RightSemiJoinSimple) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -751,8 +750,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         )", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(JoinWithParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(JoinWithParams) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         auto params = TParamsBuilder().AddParam("$in")
             .BeginList()
@@ -778,8 +777,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(NoTruncate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(NoTruncate) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -851,8 +850,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_VALUES_EQUAL(totalRows, RowsCount);
     }
 
-    Y_UNIT_TEST_TWIN(Join3TablesNoRemap, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Join3TablesNoRemap) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -880,8 +879,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Join3Tables, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Join3Tables) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -912,8 +911,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         test(false /* DisableSimpleColumns */);
     }
 
-    Y_UNIT_TEST_TWIN(JoinLeftOnly, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(JoinLeftOnly) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -945,8 +944,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         test(false /* DisableSimpleColumns */);
     }
 
-    Y_UNIT_TEST_TWIN(CrossJoin, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(CrossJoin) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -988,8 +987,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(SelfJoin3xSameLabels, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(SelfJoin3xSameLabels) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -1014,8 +1013,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson("[[[1u]];[[2u]]]", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(SelfJoin3x, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(SelfJoin3x) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -1041,8 +1040,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
     }
 
 #if 0
-    Y_UNIT_TEST_TWIN(JoinParams, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(JoinParams) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = TParamsBuilder().AddParam("$in").BeginList()
@@ -1063,8 +1062,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         Cerr << StreamResultToYson(it) << Endl;
     }
 
-    Y_UNIT_TEST_TWIN(JoinParams2, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(JoinParams2) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = TParamsBuilder()
@@ -1093,8 +1092,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         Cerr << StreamResultToYson(it) << Endl;
     }
 
-    Y_UNIT_TEST_TWIN(JoinParams3, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(JoinParams3) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto params = TParamsBuilder()
@@ -1127,10 +1126,10 @@ Y_UNIT_TEST_SUITE(KqpScan) {
     }
 #endif
 
-    Y_UNIT_TEST_QUAD(PrunePartitionsByLiteral, WithPredicatesExtract, UseSessionActor) {
+    Y_UNIT_TEST_TWIN(PrunePartitionsByLiteral, WithPredicatesExtract) {
         auto cfg = AppCfg();
         cfg.MutableFeatureFlags()->SetEnablePredicateExtractForScanQueries(WithPredicatesExtract);
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, cfg);
+        auto kikimr = DefaultKikimrRunner({}, cfg);
         auto db = kikimr.GetTableClient();
 
         TStreamExecScanQuerySettings settings;
@@ -1176,8 +1175,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(PrunePartitionsByExpr, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(PrunePartitionsByExpr) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         TStreamExecScanQuerySettings settings;
@@ -1205,14 +1204,14 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_VALUES_EQUAL(res.QueryStats->query_phases(1).affected_shards(), 1);
     }
 
-    Y_UNIT_TEST_TWIN(TooManyComputeActors, UseSessionActor) {
+    Y_UNIT_TEST(TooManyComputeActors) {
         TVector<NKikimrKqp::TKqpSetting> settings;
         auto setting = NKikimrKqp::TKqpSetting();
         setting.SetName("_KqpMaxComputeActors");
         setting.SetValue("5");
         settings.push_back(setting);
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, settings);
+        auto kikimr = DefaultKikimrRunner(settings);
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -1244,7 +1243,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_EQUAL(part.GetStatus(), EStatus::CLIENT_OUT_OF_RANGE);
     }
 
-    Y_UNIT_TEST_TWIN(EarlyFinish, UseSessionActor) {
+    Y_UNIT_TEST(EarlyFinish) {
         auto appCfg = AppCfg();
         appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetChannelBufferSize(5);
         appCfg.MutableTableServiceConfig()->MutableResourceManager()->SetMinChannelBufferSize(5);
@@ -1254,7 +1253,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             NYql::NDq::GetDqExecutionSettingsForTests().Reset();
         };
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, appCfg);
+        auto kikimr = DefaultKikimrRunner({}, appCfg);
 
         NYdb::NTable::TTableClient client(kikimr.GetDriver());
         auto session = client.CreateSession().GetValueSync().GetSession();
@@ -1282,8 +1281,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_C(it.IsSuccess(), it.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(MultipleResults, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(MultipleResults) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1297,8 +1296,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_EQUAL_C(part.GetStatus(), EStatus::PRECONDITION_FAILED, part.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(Effects, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Effects) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1314,8 +1313,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_EQUAL_C(part.GetStatus(), EStatus::PRECONDITION_FAILED, part.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(PureExpr, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(PureExpr) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1326,8 +1325,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([["42";42;25]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(UnionWithPureExpr, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(UnionWithPureExpr) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1340,8 +1339,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([["42";[42];[25]];["forty-two";#;#]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(MiltiExprWithPure, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(MiltiExprWithPure) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1354,8 +1353,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_EQUAL_C(part.GetStatus(), EStatus::PRECONDITION_FAILED, part.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(UnionBasic, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(UnionBasic) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1368,8 +1367,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[1u]];[[101u]]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(UnionMixed, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(UnionMixed) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1382,8 +1381,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[42];#];[#;[101u]]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(UnionThree, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(UnionThree) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1398,8 +1397,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[1u]];[[101u]];[[4000000003u]]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(UnionSameTable, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(UnionSameTable) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1412,8 +1411,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[1u]];[[1u]]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(UnionAggregate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(UnionAggregate) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1428,8 +1427,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[2u]];[[24u]];[[11000u]]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(CountDistinct, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(CountDistinct) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1441,8 +1440,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[1u;1u];[1u;1u]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(FullFrameWindow, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(FullFrameWindow) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1456,8 +1455,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[15];8u];[[16];8u];[[17];8u]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(SimpleWindow, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(SimpleWindow) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1483,8 +1482,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", res);
     }
 
-    Y_UNIT_TEST_TWIN(TwoAggregatesOneFullFrameWindow, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(TwoAggregatesOneFullFrameWindow) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1500,8 +1499,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[17];[2.125];8u]])", res);
     }
 
-    Y_UNIT_TEST_TWIN(TwoAggregatesTwoWindows, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(TwoAggregatesTwoWindows) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1526,8 +1525,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", res);
     }
 
-    Y_UNIT_TEST_TWIN(CustomWindow, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(CustomWindow) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1552,8 +1551,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", res);
     }
 
-    Y_UNIT_TEST_TWIN(EmptySet, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(EmptySet) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1564,8 +1563,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson("[]",res);
     }
 
-     Y_UNIT_TEST_TWIN(RestrictSqlV0, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+     Y_UNIT_TEST(RestrictSqlV0) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1579,8 +1578,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_EQUAL_C(part.GetStatus(), EStatus::GENERIC_ERROR, part.GetStatus());
     }
 
-    Y_UNIT_TEST_TWIN(LongStringCombiner, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(LongStringCombiner) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1591,8 +1590,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[[" GET /index.html HTTP/1.1"];["some very very very very long string"]]])",res);
     }
 
-    Y_UNIT_TEST_TWIN(SqlInParameter, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(SqlInParameter) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto result = db.CreateSession().GetValueSync().GetSession().ExecuteDataQuery(R"(
@@ -1625,8 +1624,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
                         [[3u];["Three"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(SqlInLiteral, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(SqlInLiteral) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto result = db.CreateSession().GetValueSync().GetSession().ExecuteDataQuery(R"(
@@ -1650,7 +1649,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
                         [[3u];["Three"]]])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(UdfFailure, UseSessionActor) {
+    Y_UNIT_TEST(UdfFailure) {
         auto testFn = [](bool disableLlvmForUdfStages) {
             TVector<NKikimrKqp::TKqpSetting> settings;
             auto setting = NKikimrKqp::TKqpSetting();
@@ -1658,7 +1657,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
             setting.SetValue(disableLlvmForUdfStages ? "true" : "false");
             settings.push_back(setting);
 
-            auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, settings);
+            auto kikimr = DefaultKikimrRunner(settings);
             auto db = kikimr.GetTableClient();
 
             auto it = db.StreamExecuteScanQuery(R"(
@@ -1682,8 +1681,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         testFn(true);
     }
 
-    Y_UNIT_TEST_TWIN(SecondaryIndex, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SecondaryIndex) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -1741,8 +1740,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(BoolFlag, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(BoolFlag) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
 
         TTableClient client{kikimr.GetDriver()};
         auto session = client.CreateSession().GetValueSync().GetSession();
@@ -1776,8 +1775,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         ])", StreamResultToYson(it));
     }
 
-    Y_UNIT_TEST_TWIN(Counters, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(Counters) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto it = db.StreamExecuteScanQuery(R"(
@@ -1790,8 +1789,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT_VALUES_EQUAL(1, counters.GetQueryTypeCounter(NKikimrKqp::EQueryType::QUERY_TYPE_SQL_SCAN)->Val());
     }
 
-    Y_UNIT_TEST_TWIN(DropRedundantSortByPk, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, AppCfg());
+    Y_UNIT_TEST(DropRedundantSortByPk) {
+        auto kikimr = DefaultKikimrRunner({}, AppCfg());
         auto db = kikimr.GetTableClient();
 
         auto settings = TStreamExecScanQuerySettings()
@@ -1833,10 +1832,9 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(LMapFunction, UseSessionActor) {
+    Y_UNIT_TEST(LMapFunction) {
         auto settings = TKikimrSettings()
-            .SetWithSampleTables(false)
-            .SetEnableKqpSessionActor(UseSessionActor);
+            .SetWithSampleTables(false);
 
         TKikimrRunner kikimr(settings);
         auto tableClient = kikimr.GetTableClient();
@@ -1879,12 +1877,12 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(result, R"([[[2];[1000];["Dogecoin"]];[[4];[1];["XTC"]];[[5];[2];["Cardano"]];[[6];[3];["Tether"]]])");
     }
 
-    Y_UNIT_TEST_TWIN(YqlTableSample, UseSessionActor) {
+    Y_UNIT_TEST(YqlTableSample) {
         auto setting = NKikimrKqp::TKqpSetting();
         setting.SetName("_KqpYqlSyntaxVersion");
         setting.SetValue("1");
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {setting});
+        auto kikimr = DefaultKikimrRunner({setting});
         auto db = kikimr.GetTableClient();
 
         const TString query(R"(SELECT * FROM `/Root/Test` TABLESAMPLE SYSTEM(1.0);)");
@@ -1898,8 +1896,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }));
     }
 
-    Y_UNIT_TEST_TWIN(CrossJoinOneColumn, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(CrossJoinOneColumn) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -1924,8 +1922,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[24u]])", StreamResultToYson(result));
     }
 
-    Y_UNIT_TEST_TWIN(CrossJoinCount, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(CrossJoinCount) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -1939,8 +1937,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson(R"([[192u]])", StreamResultToYson(result));
     }
 
-    Y_UNIT_TEST_TWIN(SelectExistsUnexpected, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SelectExistsUnexpected) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         CreateSampleTables(kikimr);
@@ -1964,8 +1962,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         CompareYson("[[%false]]", StreamResultToYson(result));
     }
 
-    Y_UNIT_TEST_TWIN(StreamLookup, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(StreamLookup) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -1992,8 +1990,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(StreamLookupByPkPrefix, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(StreamLookupByPkPrefix) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         CreateSampleTables(kikimr);
 
@@ -2035,7 +2033,7 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(StreamLookupTryGetDataBeforeSchemeInitialization, UseSessionActor) {
+    Y_UNIT_TEST(StreamLookupTryGetDataBeforeSchemeInitialization) {
         TPortManager tp;
 
         ui16 mbusport = tp.GetPort(2134);
@@ -2131,8 +2129,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         )");
     }
 
-    Y_UNIT_TEST_TWIN(LimitOverSecondaryIndexRead, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LimitOverSecondaryIndexRead) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -2166,8 +2164,8 @@ Y_UNIT_TEST_SUITE(KqpScan) {
         UNIT_ASSERT(limit.IsDefined());
     }
 
-    Y_UNIT_TEST_TWIN(TopSortOverSecondaryIndexRead, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(TopSortOverSecondaryIndexRead) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_service_ut.cpp b/ydb/core/kqp/ut/kqp_service_ut.cpp
index ce77ad2a461..9162720a785 100644
--- a/ydb/core/kqp/ut/kqp_service_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_service_ut.cpp
@@ -9,13 +9,11 @@ using namespace NYdb;
 using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpService) {
-    Y_UNIT_TEST_TWIN(Shutdown, UseSessionActor) {
+    Y_UNIT_TEST(Shutdown) {
         const ui32 Inflight = 50;
         const TDuration WaitDuration = TDuration::Seconds(1);
 
-        auto settings = TKikimrSettings()
-            .SetEnableKqpSessionActor(UseSessionActor);
-        auto kikimr = MakeHolder<TKikimrRunner>(settings);
+        auto kikimr = MakeHolder<TKikimrRunner>();
 
         NPar::LocalExecutor().RunAdditionalThreads(Inflight);
         auto driverConfig = kikimr->GetDriverConfig();
@@ -66,10 +64,8 @@ Y_UNIT_TEST_SUITE(KqpService) {
         driver.Stop(true);
     }
 
-    Y_UNIT_TEST_TWIN(CloseSessionsWithLoad, UseSessionActor) {
-        auto settings = TKikimrSettings()
-            .SetEnableKqpSessionActor(UseSessionActor);
-        auto kikimr = std::make_shared<TKikimrRunner>(settings);
+    Y_UNIT_TEST(CloseSessionsWithLoad) {
+        auto kikimr = std::make_shared<TKikimrRunner>();
         auto db = kikimr->GetTableClient();
 
         const ui32 SessionsCount = 50;
@@ -144,11 +140,11 @@ Y_UNIT_TEST_SUITE(KqpService) {
         return futures;
     }
 
-    Y_UNIT_TEST_TWIN(SessionBusy, UseSessionActor) {
+    Y_UNIT_TEST(SessionBusy) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetUseSessionBusyStatus(true);
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, appConfig);
+        auto kikimr = DefaultKikimrRunner({}, appConfig);
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -164,11 +160,11 @@ Y_UNIT_TEST_SUITE(KqpService) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(SessionBusyRetryOperation, UseSessionActor) {
+    Y_UNIT_TEST(SessionBusyRetryOperation) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetUseSessionBusyStatus(true);
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, appConfig);
+        auto kikimr = DefaultKikimrRunner({}, appConfig);
         auto db = kikimr.GetTableClient();
 
         ui32 queriesCount = 10;
@@ -196,11 +192,11 @@ Y_UNIT_TEST_SUITE(KqpService) {
          UNIT_ASSERT_VALUES_EQUAL_C(status.GetStatus(), EStatus::SUCCESS, status.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(SessionBusyRetryOperationSync, UseSessionActor) {
+    Y_UNIT_TEST(SessionBusyRetryOperationSync) {
         NKikimrConfig::TAppConfig appConfig;
         appConfig.MutableTableServiceConfig()->SetUseSessionBusyStatus(true);
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {}, appConfig);
+        auto kikimr = DefaultKikimrRunner({}, appConfig);
         auto db = kikimr.GetTableClient();
 
         ui32 queriesCount = 10;
diff --git a/ydb/core/kqp/ut/kqp_stats_ut.cpp b/ydb/core/kqp/ut/kqp_stats_ut.cpp
index 9c9eb0f4a1a..7c97c8c5d2c 100644
--- a/ydb/core/kqp/ut/kqp_stats_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_stats_ut.cpp
@@ -14,8 +14,8 @@ using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpStats) {
 
-Y_UNIT_TEST_TWIN(MultiTxStatsFullExp, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(MultiTxStatsFullExp) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
 
     TStreamExecScanQuerySettings settings;
@@ -39,8 +39,8 @@ Y_UNIT_TEST_TWIN(MultiTxStatsFullExp, UseSessionActor) {
     UNIT_ASSERT_EQUAL(node.GetMap().at("Stats").GetMapSafe().at("TotalTasks").GetIntegerSafe(), 2);
 }
 
-Y_UNIT_TEST_TWIN(JoinNoStats, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(JoinNoStats) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     TStreamExecScanQuerySettings settings;
     settings.CollectQueryStats(ECollectQueryStatsMode::None);
@@ -57,9 +57,8 @@ Y_UNIT_TEST_TWIN(JoinNoStats, UseSessionActor) {
     UNIT_ASSERT(!res.PlanJson);
 }
 
-Y_UNIT_TEST_TWIN(JoinStatsBasic, UseSessionActor) {
+Y_UNIT_TEST(JoinStatsBasic) {
     auto settings = TKikimrSettings()
-        .SetEnableKqpSessionActor(UseSessionActor)
         .SetEnableKqpScanQueryStreamLookup(false);  // TODO: enable stream lookup KIKIMR-14294
 
     TKikimrRunner kikimr(settings);
@@ -93,8 +92,8 @@ Y_UNIT_TEST_TWIN(JoinStatsBasic, UseSessionActor) {
     UNIT_ASSERT(!res.PlanJson);
 }
 
-Y_UNIT_TEST_TWIN(MultiTxStatsFull, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(MultiTxStatsFull) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     TStreamExecScanQuerySettings settings;
     settings.CollectQueryStats(ECollectQueryStatsMode::Full);
@@ -122,8 +121,8 @@ Y_UNIT_TEST_TWIN(MultiTxStatsFull, UseSessionActor) {
     UNIT_ASSERT_EQUAL(node.GetMap().at("Stats").GetMapSafe().at("TotalTasks").GetIntegerSafe(), 2);
 }
 
-Y_UNIT_TEST_TWIN(DeferredEffects, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(DeferredEffects) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
     TString planJson;
@@ -186,8 +185,8 @@ Y_UNIT_TEST_TWIN(DeferredEffects, UseSessionActor) {
     UNIT_ASSERT(std::atoi(ru->second.c_str()) > 1);
 }
 
-Y_UNIT_TEST_TWIN(DataQueryWithEffects, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(DataQueryWithEffects) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -210,7 +209,7 @@ Y_UNIT_TEST_TWIN(DataQueryWithEffects, UseSessionActor) {
 }
 
 Y_UNIT_TEST(DataQueryOldEngine) {
-    auto kikimr = KikimrRunnerEnableSessionActor(false);
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -226,8 +225,8 @@ Y_UNIT_TEST(DataQueryOldEngine) {
     AssertSuccessResult(result);
 }
 
-Y_UNIT_TEST_TWIN(DataQueryMulti, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(DataQueryMulti) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -249,8 +248,8 @@ Y_UNIT_TEST_TWIN(DataQueryMulti, UseSessionActor) {
     UNIT_ASSERT_EQUAL_C(plan.GetMapSafe().at("Plan").GetMapSafe().at("Plans").GetArraySafe().size(), 0, result.GetQueryPlan());
 }
 
-Y_UNIT_TEST_TWIN(RequestUnitForBadRequestExecute, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(RequestUnitForBadRequestExecute) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -267,8 +266,8 @@ Y_UNIT_TEST_TWIN(RequestUnitForBadRequestExecute, UseSessionActor) {
     UNIT_ASSERT(result.GetConsumedRu() > 0);
 }
 
-Y_UNIT_TEST_TWIN(RequestUnitForBadRequestExplicitPrepare, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(RequestUnitForBadRequestExplicitPrepare) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -284,8 +283,8 @@ Y_UNIT_TEST_TWIN(RequestUnitForBadRequestExplicitPrepare, UseSessionActor) {
     UNIT_ASSERT(result.GetConsumedRu() > 0);
 }
 
-Y_UNIT_TEST_TWIN(RequestUnitForSuccessExplicitPrepare, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(RequestUnitForSuccessExplicitPrepare) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -302,8 +301,8 @@ Y_UNIT_TEST_TWIN(RequestUnitForSuccessExplicitPrepare, UseSessionActor) {
     UNIT_ASSERT(result.GetConsumedRu() > 1);
 }
 
-Y_UNIT_TEST_TWIN(RequestUnitForExecute, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(RequestUnitForExecute) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -329,8 +328,8 @@ Y_UNIT_TEST_TWIN(RequestUnitForExecute, UseSessionActor) {
     }
 }
 
-Y_UNIT_TEST_TWIN(StatsProfile, UseSessionActor) {
-    auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+Y_UNIT_TEST(StatsProfile) {
+    auto kikimr = DefaultKikimrRunner();
     auto db = kikimr.GetTableClient();
     auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_sys_view_ut.cpp b/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
index 825233605a2..17d421c0608 100644
--- a/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_sys_view_ut.cpp
@@ -380,9 +380,9 @@ Y_UNIT_TEST_SUITE(KqpSystemView) {
         checkTable("`/Root/.sys/top_queries_by_cpu_time_one_hour`");
     }
 
-    Y_UNIT_TEST_TWIN(QueryStatsScan, UseSessionActor) {
+    Y_UNIT_TEST(QueryStatsScan) {
         auto checkTable = [&] (const TStringBuf tableName) {
-            auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+            auto kikimr = DefaultKikimrRunner();
             auto client = kikimr.GetTableClient();
 
             {
diff --git a/ydb/core/kqp/ut/kqp_tx_ut.cpp b/ydb/core/kqp/ut/kqp_tx_ut.cpp
index 4282ea80226..44dcd900849 100644
--- a/ydb/core/kqp/ut/kqp_tx_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_tx_ut.cpp
@@ -10,7 +10,7 @@ using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpTx) {
     Y_UNIT_TEST(DeferredEffects) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -47,7 +47,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(ExplicitTcl) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -81,8 +81,8 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         UNIT_ASSERT(HasIssue(commitResult.GetIssues(), NYql::TIssuesIds::KIKIMR_TRANSACTION_NOT_FOUND));
     }
 
-    Y_UNIT_TEST_TWIN(LocksAbortOnCommit, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(LocksAbortOnCommit) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
         {
@@ -119,7 +119,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(InteractiveTx) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -155,7 +155,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(BeginTransactionBadMode) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -167,7 +167,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(CommitRequired) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -183,7 +183,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(RollbackTx) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -212,7 +212,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(RollbackTx2) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -240,12 +240,12 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         UNIT_ASSERT(HasIssue(rollbackResult.GetIssues(), NYql::TIssuesIds::KIKIMR_TRANSACTION_NOT_FOUND));
     }
 
-    Y_UNIT_TEST_TWIN(RollbackManyTx, UseSessionActor) {
+    Y_UNIT_TEST(RollbackManyTx) {
         auto setting = NKikimrKqp::TKqpSetting();
         setting.SetName("_KqpMaxActiveTxPerSession");
         setting.SetValue("10");
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {setting});
+        auto kikimr = DefaultKikimrRunner({setting});
         auto db = kikimr.GetTableClient();
 
         auto query = R"(
@@ -293,7 +293,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(RollbackRoTx) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -315,7 +315,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(CommitRoTx) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -333,7 +333,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(CommitRoTx_TLI) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -363,7 +363,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(EmptyTxOnCommit) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -382,7 +382,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         setting.SetName("_KqpMaxActiveTxPerSession");
         setting.SetValue("2");
 
-        auto kikimr = KikimrRunnerEnableSessionActor(true, {setting});
+        auto kikimr = DefaultKikimrRunner({setting});
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -411,7 +411,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         setting.SetValue("0");
         settings.push_back(setting);
 
-        auto kikimr = KikimrRunnerEnableSessionActor(true, settings);
+        auto kikimr = DefaultKikimrRunner(settings);
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -435,7 +435,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(RollbackInvalidated) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -460,7 +460,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(CommitPrepared) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -482,7 +482,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(InvalidateOnError) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -505,7 +505,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
     }
 
     Y_UNIT_TEST(CommitStats) {
-        auto kikimr = KikimrRunnerEnableSessionActor(true);
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -533,9 +533,8 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases(0).table_access(0).updates().rows(), 1);
     }
 
-    Y_UNIT_TEST_TWIN(MixEnginesOldNew, UseSessionActor) {
-        //TKikimrRunner kikimr;
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(MixEnginesOldNew) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -564,8 +563,8 @@ Y_UNIT_TEST_SUITE(KqpTx) {
             ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(SnapshotRO, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SnapshotRO) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -594,8 +593,8 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_BAD_OPERATION));
     }
 
-    Y_UNIT_TEST_TWIN(SnapshotROInteractive1, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SnapshotROInteractive1) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -628,8 +627,8 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         CompareYson(readResult, FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(SnapshotROInteractive2, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(SnapshotROInteractive2) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -666,7 +665,7 @@ Y_UNIT_TEST_SUITE(KqpTx) {
         UNIT_ASSERT_VALUES_EQUAL_C(commitResult.GetStatus(), EStatus::SUCCESS, commitResult.GetIssues().ToString());
     }
 
-    Y_UNIT_TEST_TWIN(SnapshotRONoMvccReads, UseSessionActor) {
+    Y_UNIT_TEST(SnapshotRONoMvccReads) {
         TKikimrRunner kikimr(TKikimrSettings()
             .SetEnableMvccSnapshotReads(false));
 
diff --git a/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp b/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
index 96e9a0bbfca..443655e3c3b 100644
--- a/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_types_arrow_ut.cpp
@@ -12,8 +12,7 @@ namespace {
 
 TKikimrRunner RunnerWithArrowFormatEnabled() {
     auto settings = TKikimrSettings()
-        .SetEnableArrowFormatAtDatashard(true)
-        .SetEnableKqpSessionActor(true);
+        .SetEnableArrowFormatAtDatashard(true);
 
     return TKikimrRunner{settings};
 }
diff --git a/ydb/core/kqp/ut/kqp_write_ut.cpp b/ydb/core/kqp/ut/kqp_write_ut.cpp
index 40e2baf4dac..4d4f0e0700f 100644
--- a/ydb/core/kqp/ut/kqp_write_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_write_ut.cpp
@@ -9,12 +9,12 @@ using namespace NYdb;
 using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpWrite) {
-    Y_UNIT_TEST_TWIN(UpsertNullKey, UseSessionActor) {
+    Y_UNIT_TEST(UpsertNullKey) {
         auto setting = NKikimrKqp::TKqpSetting();
         setting.SetName("_KqpYqlSyntaxVersion");
         setting.SetValue("1");
 
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor, {setting});
+        auto kikimr = DefaultKikimrRunner({setting});
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -85,8 +85,8 @@ Y_UNIT_TEST_SUITE(KqpWrite) {
         }
     }
 
-    Y_UNIT_TEST_TWIN(Insert, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(Insert) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -202,8 +202,8 @@ Y_UNIT_TEST_SUITE(KqpWrite) {
         CompareYson(R"([[[3u]]])", FormatResultSetYson(result.GetResultSet(1)));
     }
 
-    Y_UNIT_TEST_TWIN(InsertRevert, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertRevert) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -323,8 +323,8 @@ Y_UNIT_TEST_SUITE(KqpWrite) {
         CompareYson(R"([[[1u]];[[2u]];[[3u]]])", FormatResultSetYson(result.GetResultSet(1)));
     }
 
-    Y_UNIT_TEST_TWIN(ProjectReplace, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ProjectReplace) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -371,8 +371,8 @@ Y_UNIT_TEST_SUITE(KqpWrite) {
         UNIT_ASSERT_VALUES_EQUAL(stats.query_phases().size(), 2);
     }
 
-    Y_UNIT_TEST_TWIN(CastValues, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(CastValues) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
@@ -406,8 +406,8 @@ Y_UNIT_TEST_SUITE(KqpWrite) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(CastValuesOptional, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(CastValuesOptional) {
+        auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetTableClient();
         auto session = db.CreateSession().GetValueSync().GetSession();
 
diff --git a/ydb/core/kqp/ut/kqp_yql_ut.cpp b/ydb/core/kqp/ut/kqp_yql_ut.cpp
index cab2aac4450..9f819ba58c9 100644
--- a/ydb/core/kqp/ut/kqp_yql_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_yql_ut.cpp
@@ -12,8 +12,8 @@ using namespace NYdb::NScripting;
 using namespace NYdb::NTable;
 
 Y_UNIT_TEST_SUITE(KqpYql) {
-    Y_UNIT_TEST_TWIN(RefSelect, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(RefSelect) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -28,8 +28,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(TableConcat, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(TableConcat) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -44,8 +44,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(TableRange, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(TableRange) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -60,8 +60,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(TableUseBeforeCreate, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(TableUseBeforeCreate) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -83,8 +83,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(ColumnNameConflict, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ColumnNameConflict) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -103,8 +103,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(TableNameConflict, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(TableNameConflict) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -132,8 +132,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(DdlDmlMix, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(DdlDmlMix) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -147,8 +147,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_MIXED_SCHEME_DATA_TX));
     }
 
-    Y_UNIT_TEST_TWIN(ScriptUdf, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(ScriptUdf) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -169,8 +169,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(UpdatePk, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdatePk) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -186,8 +186,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(UpdateBadType, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UpdateBadType) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -202,8 +202,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::DEFAULT_ERROR));
     }
 
-    Y_UNIT_TEST_TWIN(InsertCV, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertCV) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -217,8 +217,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_CONSTRAINT_VIOLATION));
     }
 
-    Y_UNIT_TEST_TWIN(InsertCVList, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertCVList) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -234,8 +234,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_CONSTRAINT_VIOLATION));
     }
 
-    Y_UNIT_TEST_TWIN(InsertIgnore, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(InsertIgnore) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -268,8 +268,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_READ_MODIFIED_TABLE));
     }
 
-    Y_UNIT_TEST_TWIN(UnwrapReadTableValues, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(UnwrapReadTableValues) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
@@ -284,8 +284,8 @@ Y_UNIT_TEST_SUITE(KqpYql) {
         ])", FormatResultSetYson(result.GetResultSet(0)));
     }
 
-    Y_UNIT_TEST_TWIN(CreateUseTable, UseSessionActor) {
-        auto kikimr = KikimrRunnerEnableSessionActor(UseSessionActor);
+    Y_UNIT_TEST(CreateUseTable) {
+        auto kikimr = DefaultKikimrRunner();
         TScriptingClient client(kikimr.GetDriver());
 
         auto result = client.ExecuteYqlScript(R"(
diff --git a/ydb/core/testlib/test_client.h b/ydb/core/testlib/test_client.h
index 2401c11e54c..b69246cd534 100644
--- a/ydb/core/testlib/test_client.h
+++ b/ydb/core/testlib/test_client.h
@@ -135,11 +135,6 @@ namespace Tests {
         std::function<IActor*(const NKikimrProto::TAuthConfig&)> CreateTicketParser = NKikimr::CreateTicketParser;
         std::shared_ptr<TGrpcServiceFactory> GrpcServiceFactory;
 
-        TServerSettings& SetEnableKqpSessionActor(bool enable) {
-            AppConfig.MutableTableServiceConfig()->SetEnableKqpSessionActor(enable);
-            return *this;
-        }
-
         TServerSettings& SetGrpcPort(ui16 value) { GrpcPort = value; return *this; }
         TServerSettings& SetSupportsRedirect(bool value) { SupportsRedirect = value; return *this; }
         TServerSettings& SetTracePath(const TString& value) { TracePath = value; return *this; }
diff --git a/ydb/core/tx/columnshard/ut_columnshard_tiers.cpp b/ydb/core/tx/columnshard/ut_columnshard_tiers.cpp
index 7b407936d1e..851166f30d4 100644
--- a/ydb/core/tx/columnshard/ut_columnshard_tiers.cpp
+++ b/ydb/core/tx/columnshard/ut_columnshard_tiers.cpp
@@ -206,7 +206,6 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
         serverSettings.SetDomainName("Root")
             .SetUseRealThreads(false)
             .SetEnableMetadataProvider(true)
-            .SetEnableKqpSessionActor(true)
             .SetEnableOlapSchemaOperations(true);
         ;
 
@@ -280,7 +279,6 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
         serverSettings.SetDomainName("Root")
             .SetUseRealThreads(false)
             .SetEnableMetadataProvider(true)
-            .SetEnableKqpSessionActor(true)
             .SetEnableOlapSchemaOperations(true);
         ;
 
diff --git a/ydb/core/tx/datashard/datashard_ut_kqp_errors.cpp b/ydb/core/tx/datashard/datashard_ut_kqp_errors.cpp
index 75aa10c5392..ad2af0255ec 100644
--- a/ydb/core/tx/datashard/datashard_ut_kqp_errors.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_kqp_errors.cpp
@@ -39,7 +39,6 @@ public:
         TServerSettings serverSettings(pm.GetPort(2134));
         serverSettings.SetDomainName("Root")
             .SetNodeCount(2)
-            .SetEnableKqpSessionActor(true)
             .SetUseRealThreads(false);
 
         Server = new TServer(serverSettings);
diff --git a/ydb/core/tx/datashard/datashard_ut_order.cpp b/ydb/core/tx/datashard/datashard_ut_order.cpp
index 579542a44b2..11519a94946 100644
--- a/ydb/core/tx/datashard/datashard_ut_order.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_order.cpp
@@ -1241,7 +1241,6 @@ Y_UNIT_TEST_TWIN(TestDelayedTxWaitsForWriteActiveTxOnly, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1334,7 +1333,6 @@ Y_UNIT_TEST_TWIN(TestOnlyDataTxLagCausesRejects, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1420,7 +1418,6 @@ Y_UNIT_TEST_TWIN(TestOutOfOrderLockLost, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1554,7 +1551,6 @@ Y_UNIT_TEST(TestMvccReadDoesntBlockWrites) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1693,7 +1689,6 @@ Y_UNIT_TEST_TWIN(TestOutOfOrderReadOnlyAllowed, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1804,7 +1799,6 @@ Y_UNIT_TEST_TWIN(TestOutOfOrderNonConflictingWrites, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1921,7 +1915,6 @@ Y_UNIT_TEST(TestOutOfOrderRestartLocksSingleWithoutBarrier) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(false) // intentionally, because we test non-mvcc locks logic
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2067,7 +2060,6 @@ Y_UNIT_TEST(MvccTestOutOfOrderRestartLocksSingleWithoutBarrier) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2209,7 +2201,6 @@ Y_UNIT_TEST_TWIN(TestOutOfOrderRestartLocksReorderedWithoutBarrier, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2356,7 +2347,6 @@ Y_UNIT_TEST_TWIN(TestOutOfOrderNoBarrierRestartImmediateLongTail, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2546,7 +2536,6 @@ Y_UNIT_TEST_TWIN(TestCopyTableNoDeadlock, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2730,7 +2719,6 @@ Y_UNIT_TEST(TestPlannedCancelSplit) {
     TPortManager pm;
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2919,7 +2907,6 @@ Y_UNIT_TEST_TWIN(TestPlannedTimeoutSplit, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3039,7 +3026,6 @@ Y_UNIT_TEST_TWIN(TestPlannedHalfOverloadedSplit, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3206,7 +3192,6 @@ Y_UNIT_TEST(TestReadTableWriteConflict) {
     TPortManager pm;
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3357,7 +3342,6 @@ Y_UNIT_TEST(TestReadTableImmediateWriteBlock) {
     TPortManager pm;
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3429,7 +3413,6 @@ Y_UNIT_TEST_TWIN(TestReadTableSingleShardImmediate, WithMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3477,7 +3460,6 @@ Y_UNIT_TEST(TestImmediateQueueThenSplit) {
     TPortManager pm;
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3769,7 +3751,6 @@ Y_UNIT_TEST(MvccTestSnapshotRead) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3896,7 +3877,6 @@ Y_UNIT_TEST(TestSecondaryClearanceAfterShardRestartRace) {
     TPortManager pm;
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3983,7 +3963,6 @@ Y_UNIT_TEST_TWIN(TestShardRestartNoUndeterminedImmediate, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -4095,7 +4074,6 @@ Y_UNIT_TEST_TWIN(TestShardRestartPlannedCommitShouldSucceed, UseMvcc) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(WithMvcc)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -4192,7 +4170,6 @@ Y_UNIT_TEST(TestShardSnapshotReadNoEarlyReply) {
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -4337,7 +4314,6 @@ Y_UNIT_TEST(TestSnapshotReadAfterBrokenLock) {
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -4410,7 +4386,6 @@ Y_UNIT_TEST(TestSnapshotReadAfterBrokenLockOutOfOrder) {
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -4539,7 +4514,6 @@ Y_UNIT_TEST(TestSnapshotReadAfterStuckRW) {
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
     Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -4638,7 +4612,6 @@ Y_UNIT_TEST_TWIN(TestSnapshotReadPriority, UnprotectedReads) {
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetControls(controls)
         .SetUseRealThreads(false);
 
@@ -4957,7 +4930,6 @@ Y_UNIT_TEST(TestUnprotectedReadsThenWriteVisibility) {
         .SetNodeCount(2)
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetControls(controls)
         .SetUseRealThreads(false);
 
@@ -5171,7 +5143,6 @@ Y_UNIT_TEST(UncommittedReadSetAck) {
     TServerSettings serverSettings(pm.GetPort(2134));
     serverSettings.SetDomainName("Root")
         .SetNodeCount(2)
-        .SetEnableKqpSessionActor(true)
         .SetUseRealThreads(false);
 
 
@@ -5414,7 +5385,6 @@ Y_UNIT_TEST(UncommittedReads) {
     serverSettings.SetDomainName("Root")
         .SetEnableMvcc(true)
         .SetEnableMvccSnapshotReads(true)
-        .SetEnableKqpSessionActor(true)
         .SetControls(controls)
         .SetUseRealThreads(false);
 
diff --git a/ydb/core/tx/datashard/datashard_ut_snapshot.cpp b/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
index 29574c8dab0..88a7364530f 100644
--- a/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_snapshot.cpp
@@ -988,7 +988,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetKeepSnapshotTimeout(TDuration::Seconds(2))
             .SetControls(controls);
 
@@ -1096,7 +1095,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1293,7 +1291,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1660,7 +1657,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1765,7 +1761,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -1877,7 +1872,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2018,7 +2012,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2193,7 +2186,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2356,7 +2348,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2513,7 +2504,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2616,7 +2606,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2706,7 +2695,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2820,7 +2808,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -2940,7 +2927,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3065,7 +3051,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3249,7 +3234,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);
@@ -3351,7 +3335,6 @@ Y_UNIT_TEST_SUITE(DataShardSnapshots) {
             .SetUseRealThreads(false)
             .SetEnableMvcc(true)
             .SetEnableMvccSnapshotReads(true)
-            .SetEnableKqpSessionActor(true)
             .SetControls(controls);
 
         Tests::TServer::TPtr server = new TServer(serverSettings);