diff --git a/yaml-tests/src/test/resources/aggregate-empty-table.yamsql b/yaml-tests/src/test/resources/aggregate-empty-table.yamsql
index 921c936fcf..6e8e52384a 100644
--- a/yaml-tests/src/test/resources/aggregate-empty-table.yamsql
+++ b/yaml-tests/src/test/resources/aggregate-empty-table.yamsql
@@ -338,9 +338,6 @@ test_block:
       - error: "0AF00"
     -
       - query: select count(*) from T2;
-      # Cannot support FORCE_CONTINUATIONS due to non-empty aggregate scan returning a begin continuation.
-      # See: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - explain: "AISCAN(T2_I1 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
       - result: [{0}]
     -
@@ -405,9 +402,6 @@ test_block:
     -
       - query: select count(col2) from T2;
       - explain: "AISCAN(T2_I3 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # Cannot support FORCE_CONTINUATIONS due to non-empty aggregate scan returning a begin continuation.
-      # See: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - result: [{0}]
     -
       - query: select count(col2) from T2 where col1 = 0;
@@ -479,10 +473,7 @@ test_block:
       # - subtract the indexed value when the corresponding tuple is removed from the base table.
       # - if the sum reaches zero, it keeps it in the sum index and does not remove the entry from there.
       - query: select sum(col1) from T2;
-      # Cannot support FORCE_CONTINUATIONS due to non-empty aggregate scan returning a begin continuation.
-      # See: https://github.com/FoundationDB/fdb-record-layer/issues/3206
       - explain: "AISCAN(T2_I5 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (_._0._0 AS _0)"
-      - maxRows: 0
       - result: [{0}]
     -
       - query: select sum(col1) from T2 where col1 = 0;
diff --git a/yaml-tests/src/test/resources/aggregate-index-tests-count.yamsql b/yaml-tests/src/test/resources/aggregate-index-tests-count.yamsql
index 70ba38c81a..1ce95c4add 100644
--- a/yaml-tests/src/test/resources/aggregate-index-tests-count.yamsql
+++ b/yaml-tests/src/test/resources/aggregate-index-tests-count.yamsql
@@ -47,18 +47,7 @@ test_block:
     -
       - query: select count(*) from t1
       - explain: "AISCAN(MV1 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # Cannot run with FORCE_CONTINUATIONS due to: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - result: [{4}]
-    -
-      - query: select count(*) from t1
-      - explain: "AISCAN(MV1 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # https://github.com/FoundationDB/fdb-record-layer/issues/3206 is fixed since 4.8.1.0
-      - maxRows: 1
-      - initialVersionAtLeast: 4.8.1.0
-      - result: [{4}]
-      - result: []
-      - initialVersionLessThan: 4.8.1.0
     -
       - query: select count(*) from t1 group by col2
       - explain: "AISCAN(MV2 <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) | MAP (_._1 AS _0)"
@@ -66,18 +55,7 @@ test_block:
     -
       - query: select count(col1) from t1
       - explain: "AISCAN(MV3 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # Cannot run with FORCE_CONTINUATIONS due to: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
-      - result: [{2}]
-    -
-      - query: select count(col1) from t1
-      - explain: "AISCAN(MV3 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # https://github.com/FoundationDB/fdb-record-layer/issues/3206 is fixed since 4.8.1.0
-      - maxRows: 1
-      - initialVersionAtLeast: 4.8.1.0
       - result: [{2}]
-      - result: []
-      - initialVersionLessThan: 4.8.1.0
     -
       - query: select count(col1) from t1 group by col2
       - explain: "AISCAN(MV4 <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) | MAP (_._1 AS _0)"
@@ -103,8 +81,6 @@ test_block:
     -
       - query: select count(*) from t2
       - explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count_star(*) AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # Cannot run with FORCE_CONTINUATIONS due to: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - result: [{4}]
     -
       - query: select count(*) from t2 group by col2
@@ -113,8 +89,6 @@ test_block:
     -
       - query: select count(col1) from t2
       - explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count(_._0.COL1) AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
-      # Cannot run with FORCE_CONTINUATIONS due to: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - result: [{2}]
     -
       - query: select count(col1) from t2 group by col2
diff --git a/yaml-tests/src/test/resources/aggregate-index-tests.yamsql b/yaml-tests/src/test/resources/aggregate-index-tests.yamsql
index d7895fedf0..cd40d7289e 100644
--- a/yaml-tests/src/test/resources/aggregate-index-tests.yamsql
+++ b/yaml-tests/src/test/resources/aggregate-index-tests.yamsql
@@ -254,8 +254,6 @@ test_block:
       - result: [{!l 100}, {!l 200}, {!l 400}]
     -
       - query: select min_ever(col3) from t2
-       # Cannot enable FORCE_CONTINUATIONS with ungrouped aggregate scan because of: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - explain: "AISCAN(MV7 <,> BY_GROUP -> [_0: VALUE:[0]]) | MAP (_ AS _0) | ON EMPTY NULL | MAP (_._0._0 AS _0)"
       - result: [{!l 1}]
     -
diff --git a/yaml-tests/src/test/resources/catalog.yamsql b/yaml-tests/src/test/resources/catalog.yamsql
index 790f834905..eab3bf719c 100644
--- a/yaml-tests/src/test/resources/catalog.yamsql
+++ b/yaml-tests/src/test/resources/catalog.yamsql
@@ -72,7 +72,6 @@ test_block:
       - query: select sum(cnt) from (select count(*) as cnt, template_name, template_version from schemas
           group by template_name, template_version having template_name = 'TEST_TEMPLATE_1' and template_version = 1) as t;
       - explain: "AISCAN(TEMPLATES_COUNT_INDEX [EQUALS promote(@c29 AS STRING), EQUALS promote(@c33 AS INT)] BY_GROUP -> [_0: KEY:[0], _1: KEY:[1], _2: VALUE:[0]]) | MAP ((_._2 AS CNT, _._0 AS TEMPLATE_NAME, _._1 AS TEMPLATE_VERSION) AS _0) | AGG (sum_l(_._0.CNT) AS _0) | ON EMPTY NULL | MAP (_._0._0 AS _0)"
-      - maxRows: 0 # Disable force continuations because of empty continuation due to: https://github.com/FoundationDB/fdb-record-layer/issues/3206
       - result: [{4}]
     -
       # how many unique templates in a cluster?
diff --git a/yaml-tests/src/test/resources/distinct-from.yamsql b/yaml-tests/src/test/resources/distinct-from.yamsql
index 7a8ae77071..4c61722965 100644
--- a/yaml-tests/src/test/resources/distinct-from.yamsql
+++ b/yaml-tests/src/test/resources/distinct-from.yamsql
@@ -92,16 +92,10 @@ test_block:
       - result: [{ID: 6, 20, !null }, {ID: 7, 20, !null }, {ID: 8, 20, !null }, {ID: 9, 20, 9}, {ID: 10, 20, 10}]
     -
       - query: select count(*) from t1 WHERE null is not distinct from null
-        # Cannot support FORCE_CONTINUATIONS due to non-empty aggregate scan returning a begin continuation.
-        # See: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - explain: "AISCAN(CNT <,> BY_GROUP -> [_0: VALUE:[0]]) | FILTER NULL NOT_DISTINCT_FROM NULL | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
       - result: [{10}]
     -
       - query: select count(*) from t1 WHERE 10 is not distinct from 10
-        # Cannot support FORCE_CONTINUATIONS due to non-empty aggregate scan returning a begin continuation.
-        # See: https://github.com/FoundationDB/fdb-record-layer/issues/3206
-      - maxRows: 0
       - explain: "AISCAN(CNT <,> BY_GROUP -> [_0: VALUE:[0]]) | FILTER @c9 NOT_DISTINCT_FROM @c9 | MAP (_ AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
       - result: [{10}]
 ...