diff --git a/regression-test/data/export_p2/test_export_with_parallelism.out b/regression-test/data/export_p2/test_export_with_parallelism.out
index 63ba35eab0caed..a32aeda7ee5954 100644
--- a/regression-test/data/export_p2/test_export_with_parallelism.out
+++ b/regression-test/data/export_p2/test_export_with_parallelism.out
@@ -1631,3 +1631,284 @@
 98	ftw-98	116
 99	ftw-99	117
 
+-- !select --
+100	\N	\N
+11	ftw-11	29
+12	ftw-12	30
+13	ftw-13	31
+14	ftw-14	32
+15	ftw-15	33
+16	ftw-16	34
+17	ftw-17	35
+18	ftw-18	36
+19	ftw-19	37
+20	ftw-20	38
+21	ftw-21	39
+22	ftw-22	40
+23	ftw-23	41
+24	ftw-24	42
+25	ftw-25	43
+26	ftw-26	44
+27	ftw-27	45
+28	ftw-28	46
+29	ftw-29	47
+30	ftw-30	48
+31	ftw-31	49
+32	ftw-32	50
+33	ftw-33	51
+34	ftw-34	52
+35	ftw-35	53
+36	ftw-36	54
+37	ftw-37	55
+38	ftw-38	56
+39	ftw-39	57
+40	ftw-40	58
+41	ftw-41	59
+42	ftw-42	60
+43	ftw-43	61
+44	ftw-44	62
+45	ftw-45	63
+46	ftw-46	64
+47	ftw-47	65
+48	ftw-48	66
+49	ftw-49	67
+50	ftw-50	68
+51	ftw-51	69
+52	ftw-52	70
+53	ftw-53	71
+54	ftw-54	72
+55	ftw-55	73
+56	ftw-56	74
+57	ftw-57	75
+58	ftw-58	76
+59	ftw-59	77
+60	ftw-60	78
+61	ftw-61	79
+62	ftw-62	80
+63	ftw-63	81
+64	ftw-64	82
+65	ftw-65	83
+66	ftw-66	84
+67	ftw-67	85
+68	ftw-68	86
+69	ftw-69	87
+70	ftw-70	88
+71	ftw-71	89
+72	ftw-72	90
+73	ftw-73	91
+74	ftw-74	92
+75	ftw-75	93
+76	ftw-76	94
+77	ftw-77	95
+78	ftw-78	96
+79	ftw-79	97
+80	ftw-80	98
+81	ftw-81	99
+82	ftw-82	100
+83	ftw-83	101
+84	ftw-84	102
+85	ftw-85	103
+86	ftw-86	104
+87	ftw-87	105
+88	ftw-88	106
+89	ftw-89	107
+90	ftw-90	108
+91	ftw-91	109
+92	ftw-92	110
+93	ftw-93	111
+94	ftw-94	112
+95	ftw-95	113
+96	ftw-96	114
+97	ftw-97	115
+98	ftw-98	116
+99	ftw-99	117
+
+-- !select --
+1	ftw-1	19
+10	ftw-10	28
+11	ftw-11	29
+12	ftw-12	30
+13	ftw-13	31
+14	ftw-14	32
+15	ftw-15	33
+16	ftw-16	34
+17	ftw-17	35
+18	ftw-18	36
+19	ftw-19	37
+2	ftw-2	20
+20	ftw-20	38
+21	ftw-21	39
+22	ftw-22	40
+23	ftw-23	41
+24	ftw-24	42
+25	ftw-25	43
+26	ftw-26	44
+27	ftw-27	45
+28	ftw-28	46
+29	ftw-29	47
+3	ftw-3	21
+30	ftw-30	48
+31	ftw-31	49
+4	ftw-4	22
+5	ftw-5	23
+6	ftw-6	24
+7	ftw-7	25
+8	ftw-8	26
+9	ftw-9	27
+
+-- !select --
+10	ftw-10	28
+11	ftw-11	29
+12	ftw-12	30
+13	ftw-13	31
+14	ftw-14	32
+15	ftw-15	33
+16	ftw-16	34
+17	ftw-17	35
+18	ftw-18	36
+19	ftw-19	37
+2	ftw-2	20
+20	ftw-20	38
+21	ftw-21	39
+22	ftw-22	40
+23	ftw-23	41
+24	ftw-24	42
+25	ftw-25	43
+26	ftw-26	44
+27	ftw-27	45
+28	ftw-28	46
+29	ftw-29	47
+3	ftw-3	21
+30	ftw-30	48
+31	ftw-31	49
+32	ftw-32	50
+33	ftw-33	51
+34	ftw-34	52
+35	ftw-35	53
+36	ftw-36	54
+37	ftw-37	55
+38	ftw-38	56
+39	ftw-39	57
+4	ftw-4	22
+40	ftw-40	58
+41	ftw-41	59
+42	ftw-42	60
+43	ftw-43	61
+44	ftw-44	62
+45	ftw-45	63
+46	ftw-46	64
+47	ftw-47	65
+48	ftw-48	66
+49	ftw-49	67
+5	ftw-5	23
+50	ftw-50	68
+51	ftw-51	69
+52	ftw-52	70
+53	ftw-53	71
+54	ftw-54	72
+55	ftw-55	73
+56	ftw-56	74
+57	ftw-57	75
+58	ftw-58	76
+59	ftw-59	77
+6	ftw-6	24
+60	ftw-60	78
+61	ftw-61	79
+62	ftw-62	80
+63	ftw-63	81
+64	ftw-64	82
+65	ftw-65	83
+66	ftw-66	84
+67	ftw-67	85
+68	ftw-68	86
+69	ftw-69	87
+7	ftw-7	25
+70	ftw-70	88
+71	ftw-71	89
+72	ftw-72	90
+73	ftw-73	91
+74	ftw-74	92
+75	ftw-75	93
+76	ftw-76	94
+77	ftw-77	95
+78	ftw-78	96
+79	ftw-79	97
+8	ftw-8	26
+80	ftw-80	98
+81	ftw-81	99
+82	ftw-82	100
+83	ftw-83	101
+84	ftw-84	102
+85	ftw-85	103
+86	ftw-86	104
+87	ftw-87	105
+88	ftw-88	106
+89	ftw-89	107
+9	ftw-9	27
+90	ftw-90	108
+91	ftw-91	109
+92	ftw-92	110
+93	ftw-93	111
+94	ftw-94	112
+95	ftw-95	113
+96	ftw-96	114
+97	ftw-97	115
+98	ftw-98	116
+99	ftw-99	117
+
+-- !select --
+10	ftw-10	28
+12	ftw-12	30
+14	ftw-14	32
+16	ftw-16	34
+18	ftw-18	36
+2	ftw-2	20
+20	ftw-20	38
+22	ftw-22	40
+24	ftw-24	42
+26	ftw-26	44
+28	ftw-28	46
+30	ftw-30	48
+32	ftw-32	50
+34	ftw-34	52
+36	ftw-36	54
+38	ftw-38	56
+4	ftw-4	22
+40	ftw-40	58
+42	ftw-42	60
+44	ftw-44	62
+46	ftw-46	64
+48	ftw-48	66
+50	ftw-50	68
+52	ftw-52	70
+54	ftw-54	72
+56	ftw-56	74
+58	ftw-58	76
+6	ftw-6	24
+60	ftw-60	78
+62	ftw-62	80
+64	ftw-64	82
+66	ftw-66	84
+68	ftw-68	86
+70	ftw-70	88
+72	ftw-72	90
+74	ftw-74	92
+76	ftw-76	94
+78	ftw-78	96
+8	ftw-8	26
+80	ftw-80	98
+82	ftw-82	100
+84	ftw-84	102
+86	ftw-86	104
+88	ftw-88	106
+90	ftw-90	108
+92	ftw-92	110
+94	ftw-94	112
+96	ftw-96	114
+98	ftw-98	116
+
+-- !select --
+
+-- !select --
+13	ftw-13	31
+
diff --git a/regression-test/suites/export_p2/test_export_with_parallelism.groovy b/regression-test/suites/export_p2/test_export_with_parallelism.groovy
index dca7f4c67c4563..ece87bafd8bed8 100644
--- a/regression-test/suites/export_p2/test_export_with_parallelism.groovy
+++ b/regression-test/suites/export_p2/test_export_with_parallelism.groovy
@@ -89,11 +89,11 @@ suite("test_export_with_parallelism", "p2") {
 
     def outFilePath = """${bucket}/export/exp_"""
 
-    def test_export = {format, file_suffix, isDelete, parallelism ->
+    def test_export = {format, file_suffix, isDelete, parallelism, whereExpr ->
         def uuid = UUID.randomUUID().toString()
         // exec export
         sql """
-            EXPORT TABLE ${table_export_name} TO "s3://${outFilePath}"
+            EXPORT TABLE ${table_export_name}  ${whereExpr}  TO "s3://${outFilePath}"
             PROPERTIES(
                 "label" = "${uuid}",
                 "format" = "${format}",
@@ -144,24 +144,34 @@ suite("test_export_with_parallelism", "p2") {
     }
 
     // parallelism = 2
-    test_export('csv', 'csv', true, 2);
-    test_export('parquet', 'parquet', true, 2);
-    test_export('orc', 'orc', true, 2);
-    test_export('csv_with_names', 'csv', true, 2);
-    test_export('csv_with_names_and_types', 'csv', true, 2);
+    test_export('csv', 'csv', true, 2,"");
+    test_export('parquet', 'parquet', true, 2,"");
+    test_export('orc', 'orc', true, 2,"");
+    test_export('csv_with_names', 'csv', true, 2,"");
+    test_export('csv_with_names_and_types', 'csv', true, 2,"");
 
 
     // parallelism = 3
-    test_export('csv', 'csv', true, 3);
-    test_export('parquet', 'parquet', true, 3);
-    test_export('orc', 'orc', true, 3);
-    test_export('csv_with_names', 'csv', true, 3);
-    test_export('csv_with_names_and_types', 'csv', true, 3);
+    test_export('csv', 'csv', true, 3,"");
+    test_export('parquet', 'parquet', true, 3,"");
+    test_export('orc', 'orc', true, 3,"");
+    test_export('csv_with_names', 'csv', true, 3,"");
+    test_export('csv_with_names_and_types', 'csv', true, 3,"");
 
     // parallelism = 4
-    test_export('csv', 'csv', true, 4);
-    test_export('parquet', 'parquet', true, 4);
-    test_export('orc', 'orc', true, 4);
-    test_export('csv_with_names', 'csv', true, 4);
-    test_export('csv_with_names_and_types', 'csv', true, 4);
+    test_export('csv', 'csv', true, 4,"");
+    test_export('parquet', 'parquet', true, 4,"");
+    test_export('orc', 'orc', true, 4,"");
+    test_export('csv_with_names', 'csv', true, 4,"");
+    test_export('csv_with_names_and_types', 'csv', true, 4,"");
+
+
+    // where ...
+    test_export('parquet', 'parquet', true, 4, " where id > 10 ");
+    test_export('orc', 'orc', true, 5, " where age < 50");
+    test_export('parquet', 'parquet', true, 6,  """ where name != 'ftw-1'  """);
+    test_export('orc', 'orc', true, 7, " where age%2 = 0 ");
+    test_export('parquet', 'parquet', true, 9,  """ where age = 13 """);
+    test_export('orc', 'orc', true, 10, " where id = 13 ");
+
 }