diff --git a/src/test/regress/expected/bfv_partition.out b/src/test/regress/expected/bfv_partition.out
index 5b7e5bbabeea7adc7aed8273a2353758ad8f9863..6b8acdb8e046b7f15900dfc0b8596e2c92a0663a 100644
--- a/src/test/regress/expected/bfv_partition.out
+++ b/src/test/regress/expected/bfv_partition.out
@@ -69,6 +69,18 @@ select count_operator('explain select cust_type, subscription_status,count(disti
               0
 (1 row)
 
+insert into mpp7980 values('2009-04-01','xyz','zyz','1',1,1,'1');
+insert into mpp7980 values('2009-04-01','zxyz','zyz','2',2,1,'1');
+insert into mpp7980 values('2009-03-03','xyz','zyz','4',1,3,'1');
+select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id ='2009-04-01' group by rollup(1,2);
+ cust_type | subscription_status | count | sum  | sum  
+-----------+---------------------+-------+------+------
+           |                     |     1 | 3.00 | 2.00
+ zyz       |                     |     1 | 3.00 | 2.00
+ zyz       | 1                   |     1 | 1.00 | 1.00
+ zyz       | 2                   |     1 | 2.00 | 1.00
+(4 rows)
+
 -- CLEANUP
 -- start_ignore
 drop table mpp7980;
diff --git a/src/test/regress/expected/bfv_partition_optimizer.out b/src/test/regress/expected/bfv_partition_optimizer.out
index aa9bee5c8591c039de8a30ad5a1a1be11bf50a84..5d8971a23ea700c058ecd4afa57db6d5e98fd8fb 100644
--- a/src/test/regress/expected/bfv_partition_optimizer.out
+++ b/src/test/regress/expected/bfv_partition_optimizer.out
@@ -69,6 +69,18 @@ select count_operator('explain select cust_type, subscription_status,count(disti
               0
 (1 row)
 
+insert into mpp7980 values('2009-04-01','xyz','zyz','1',1,1,'1');
+insert into mpp7980 values('2009-04-01','zxyz','zyz','2',2,1,'1');
+insert into mpp7980 values('2009-03-03','xyz','zyz','4',1,3,'1');
+select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id ='2009-04-01' group by rollup(1,2);
+ cust_type | subscription_status | count | sum  | sum  
+-----------+---------------------+-------+------+------
+           |                     |     1 | 3.00 | 2.00
+ zyz       |                     |     1 | 3.00 | 2.00
+ zyz       | 1                   |     1 | 1.00 | 1.00
+ zyz       | 2                   |     1 | 2.00 | 1.00
+(4 rows)
+
 -- CLEANUP
 -- start_ignore
 drop table mpp7980;
diff --git a/src/test/regress/sql/bfv_partition.sql b/src/test/regress/sql/bfv_partition.sql
index d9e9d139fda7a5e66e41c5bab75667d6187d2750..01a02c4488b16bc0891c3d6a9103b4edbb770ffc 100644
--- a/src/test/regress/sql/bfv_partition.sql
+++ b/src/test/regress/sql/bfv_partition.sql
@@ -62,6 +62,11 @@ distributed by (subscription_id, bill_stmt_id)
 -- TEST
 select count_operator('explain select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id =E''2009-04-01'' group by rollup(1,2);','SIGSEGV');
 
+insert into mpp7980 values('2009-04-01','xyz','zyz','1',1,1,'1');
+insert into mpp7980 values('2009-04-01','zxyz','zyz','2',2,1,'1');
+insert into mpp7980 values('2009-03-03','xyz','zyz','4',1,3,'1');
+select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id ='2009-04-01' group by rollup(1,2);
+
 -- CLEANUP
 -- start_ignore
 drop table mpp7980;
diff --git a/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/expected/mpp7980.ans b/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/expected/mpp7980.ans
deleted file mode 100644
index 6c42b4a2d4ccc2f62c48e704031e2af0655119fa..0000000000000000000000000000000000000000
--- a/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/expected/mpp7980.ans
+++ /dev/null
@@ -1,43 +0,0 @@
--- start_ignore
--- end_ignore
--- MPP-7980
--- Johnny Soedomo
-create table mpp7980
-(
- month_id date,
- bill_stmt_id  character varying(30),
- cust_type     character varying(10),
- subscription_status      character varying(30),
- voice_call_min           numeric(15,2),
- minute_per_call          numeric(15,2),
- subscription_id          character varying(15)
-)
-distributed by (subscription_id, bill_stmt_id)
-  PARTITION BY RANGE(month_id)
-    (
-    start ('2009-02-01'::date) end ('2009-08-01'::date)  exclusive EVERY (INTERVAL '1 month')
-    );
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_1" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_2" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_3" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_4" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_5" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_6" for table "mpp7980"
-CREATE TABLE
-insert into mpp7980 values('2009-04-01','xyz','zyz','1',1,1,'1');
-INSERT 0 1
-insert into mpp7980 values('2009-04-01','zxyz','zyz','2',2,1,'1');
-INSERT 0 1
-insert into mpp7980 values('2009-03-03','xyz','zyz','4',1,3,'1');
-INSERT 0 1
-select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id ='2009-04-01' group by rollup(1,2);
- cust_type | subscription_status | count | sum  | sum  
------------+---------------------+-------+------+------
- zyz       | 1                   |     1 | 1.00 | 1.00
- zyz       | 2                   |     1 | 2.00 | 1.00
- zyz       |                     |     1 | 3.00 | 2.00
-           |                     |     1 | 3.00 | 2.00
-(4 rows)
-
-drop table mpp7980;
-DROP TABLE
diff --git a/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/expected/mpp7980.ans.orca b/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/expected/mpp7980.ans.orca
deleted file mode 100644
index 6c42b4a2d4ccc2f62c48e704031e2af0655119fa..0000000000000000000000000000000000000000
--- a/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/expected/mpp7980.ans.orca
+++ /dev/null
@@ -1,43 +0,0 @@
--- start_ignore
--- end_ignore
--- MPP-7980
--- Johnny Soedomo
-create table mpp7980
-(
- month_id date,
- bill_stmt_id  character varying(30),
- cust_type     character varying(10),
- subscription_status      character varying(30),
- voice_call_min           numeric(15,2),
- minute_per_call          numeric(15,2),
- subscription_id          character varying(15)
-)
-distributed by (subscription_id, bill_stmt_id)
-  PARTITION BY RANGE(month_id)
-    (
-    start ('2009-02-01'::date) end ('2009-08-01'::date)  exclusive EVERY (INTERVAL '1 month')
-    );
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_1" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_2" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_3" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_4" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_5" for table "mpp7980"
-psql:/path/sql_file:1: NOTICE:  CREATE TABLE will create partition "mpp7980_1_prt_6" for table "mpp7980"
-CREATE TABLE
-insert into mpp7980 values('2009-04-01','xyz','zyz','1',1,1,'1');
-INSERT 0 1
-insert into mpp7980 values('2009-04-01','zxyz','zyz','2',2,1,'1');
-INSERT 0 1
-insert into mpp7980 values('2009-03-03','xyz','zyz','4',1,3,'1');
-INSERT 0 1
-select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id ='2009-04-01' group by rollup(1,2);
- cust_type | subscription_status | count | sum  | sum  
------------+---------------------+-------+------+------
- zyz       | 1                   |     1 | 1.00 | 1.00
- zyz       | 2                   |     1 | 2.00 | 1.00
- zyz       |                     |     1 | 3.00 | 2.00
-           |                     |     1 | 3.00 | 2.00
-(4 rows)
-
-drop table mpp7980;
-DROP TABLE
diff --git a/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/sql/mpp7980.sql b/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/sql/mpp7980.sql
deleted file mode 100644
index 7d56df130bca1b7820ec76e488e3599210c5fe60..0000000000000000000000000000000000000000
--- a/src/test/tinc/tincrepo/mpp/gpdb/tests/storage/basic/partition/sql/mpp7980.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- MPP-7980
--- Johnny Soedomo
-create table mpp7980
-(
- month_id date,
- bill_stmt_id  character varying(30),
- cust_type     character varying(10),
- subscription_status      character varying(30),
- voice_call_min           numeric(15,2),
- minute_per_call          numeric(15,2),
- subscription_id          character varying(15)
-)
-distributed by (subscription_id, bill_stmt_id)
-  PARTITION BY RANGE(month_id)
-    (
-    start ('2009-02-01'::date) end ('2009-08-01'::date)  exclusive EVERY (INTERVAL '1 month')
-    );
-
-insert into mpp7980 values('2009-04-01','xyz','zyz','1',1,1,'1');
-insert into mpp7980 values('2009-04-01','zxyz','zyz','2',2,1,'1');
-insert into mpp7980 values('2009-03-03','xyz','zyz','4',1,3,'1');
-
-
-select cust_type, subscription_status,count(distinct subscription_id),sum(voice_call_min),sum(minute_per_call) from mpp7980 where month_id ='2009-04-01' group by rollup(1,2);
-
-drop table mpp7980;