diff --git a/src/test/regress/expected/boolean.out b/src/test/regress/expected/boolean.out
index 091513690173aab40ab09fdfd501252d5acf20ab..9c8ae4447f012c950109cd05364b7be81faba792 100644
--- a/src/test/regress/expected/boolean.out
+++ b/src/test/regress/expected/boolean.out
@@ -177,3 +177,5 @@ tf_12_ff_4|f1|f1
|f |f
(16 rows)
+QUERY: DROP TABLE BOOLTBL1;
+QUERY: DROP TABLE BOOLTBL2;
diff --git a/src/test/regress/expected/box.out b/src/test/regress/expected/box.out
index 19d2a65308f0b99ab384d9674d724f9f38f39fe6..a3d5329fc3b3ed9724115271f942413bd9b45034 100644
--- a/src/test/regress/expected/box.out
+++ b/src/test/regress/expected/box.out
@@ -167,3 +167,4 @@ one|f1 |f1
|(3,3),(1,1)|(3,3),(3,3)
(1 row)
+QUERY: DROP TABLE BOX_TBL;
diff --git a/src/test/regress/expected/char.out b/src/test/regress/expected/char.out
index e8c8fae00fb38c1f0cbd5a60398aab62f835d1fa..88cc3e7df86b09af4e23a7389bf1ebbd3b2a549d 100644
--- a/src/test/regress/expected/char.out
+++ b/src/test/regress/expected/char.out
@@ -81,3 +81,4 @@ two|f1
|c
(2 rows)
+QUERY: DROP TABLE CHAR_TBL;
diff --git a/src/test/regress/expected/char16.out b/src/test/regress/expected/char16.out
index ca449c44590f1b03eafb69a5623e74fb146302e8..76695268b591f1cdc772edfcdbe6e1b170b1180a 100644
--- a/src/test/regress/expected/char16.out
+++ b/src/test/regress/expected/char16.out
@@ -101,3 +101,4 @@ two|f1
|d34aaasdf
(2 rows)
+QUERY: DROP TABLE CHAR16_TBL;
diff --git a/src/test/regress/expected/char2.out b/src/test/regress/expected/char2.out
index 0bef6660c242ef53d128c8ee9b8fb908182bcfe7..d045f61365c47514861840e2025f04cdb55ab7f4 100644
--- a/src/test/regress/expected/char2.out
+++ b/src/test/regress/expected/char2.out
@@ -98,3 +98,4 @@ one|f1
|34
(1 row)
+QUERY: DROP TABLE CHAR2_TBL;
diff --git a/src/test/regress/expected/char4.out b/src/test/regress/expected/char4.out
index da2c92fd37d0bb2a0961f915d608614919e57d0f..84a595fc79aeab20de5e3003c4d7263cff530ce1 100644
--- a/src/test/regress/expected/char4.out
+++ b/src/test/regress/expected/char4.out
@@ -94,3 +94,4 @@ three|f1
|1234
(3 rows)
+QUERY: DROP TABLE CHAR4_TBL;
diff --git a/src/test/regress/expected/char8.out b/src/test/regress/expected/char8.out
index 93e96664207997948494701c1362654d9032f5c6..2078c3b5e28e05160408a10206ecc17293d975a9 100644
--- a/src/test/regress/expected/char8.out
+++ b/src/test/regress/expected/char8.out
@@ -103,3 +103,4 @@ three|f1
|12345678
(3 rows)
+QUERY: DROP TABLE CHAR8_TBL;
diff --git a/src/test/regress/expected/float4.out b/src/test/regress/expected/float4.out
index 92cfe073af71e8c9dbdddb35ce05e88c268b0b9c..143f6d62fc296a53ae0846adb6df617a10842e8e 100644
--- a/src/test/regress/expected/float4.out
+++ b/src/test/regress/expected/float4.out
@@ -146,3 +146,4 @@ five|f1
|-1.23457e-20
(5 rows)
+QUERY: DROP TABLE FLOAT4_TBL;
diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out
index 45ae14a34c24da27f9fd95cbc89ed1da1733ac40..78e375725c5bb2a3e1549abba8bb66ed628f69ab 100644
--- a/src/test/regress/expected/float8.out
+++ b/src/test/regress/expected/float8.out
@@ -223,3 +223,4 @@ five|f1
|-1.2345678901234e-200
(5 rows)
+QUERY: DROP TABLE FLOAT8_TBL;
diff --git a/src/test/regress/expected/int2.out b/src/test/regress/expected/int2.out
index ef79f91fc91894034c51c7ecf483eb8b75f20c52..fc875b5a413ddc43e4925691d4fcff0b448183a5 100644
--- a/src/test/regress/expected/int2.out
+++ b/src/test/regress/expected/int2.out
@@ -7,7 +7,7 @@ WARN:pg_atoi: error in "34.5": can't parse ".5"
QUERY: INSERT INTO INT2_TBL(f1) VALUES ('32767');
QUERY: INSERT INTO INT2_TBL(f1) VALUES ('-32767');
QUERY: INSERT INTO INT2_TBL(f1) VALUES ('100000');
-WARN:pg_atoi: error reading "100000": Math result not representable
+WARN:pg_atoi: error reading "100000": Result too large
QUERY: INSERT INTO INT2_TBL(f1) VALUES ('asdf');
WARN:pg_atoi: error in "asdf": can't parse "asdf"
QUERY: SELECT '' AS five, INT2_TBL.*;
@@ -204,3 +204,4 @@ five| f1| x
|-32767|-16383
(5 rows)
+QUERY: DROP TABLE INT2_TBL;
diff --git a/src/test/regress/expected/int4.out b/src/test/regress/expected/int4.out
index ed3b9f2d0964e80ace6657f8d42f624877c33256..30eb67949b80c09b6c076087c3eb40ce9286b6d6 100644
--- a/src/test/regress/expected/int4.out
+++ b/src/test/regress/expected/int4.out
@@ -7,7 +7,7 @@ WARN:pg_atoi: error in "34.5": can't parse ".5"
QUERY: INSERT INTO INT4_TBL(f1) VALUES ('2147483647');
QUERY: INSERT INTO INT4_TBL(f1) VALUES ('-2147483647');
QUERY: INSERT INTO INT4_TBL(f1) VALUES ('1000000000000');
-WARN:pg_atoi: error reading "1000000000000": Math result not representable
+WARN:pg_atoi: error reading "1000000000000": Result too large
QUERY: INSERT INTO INT4_TBL(f1) VALUES ('asdf');
WARN:pg_atoi: error in "asdf": can't parse "asdf"
QUERY: SELECT '' AS five, INT4_TBL.*;
@@ -276,3 +276,4 @@ three
3
(1 row)
+QUERY: DROP TABLE INT4_TBL;
diff --git a/src/test/regress/expected/oid.out b/src/test/regress/expected/oid.out
index c7f413c4119800dace935d0ec7041eae0db09408..ad6f783240ddcffe9ed253d70390c38f96b35a3b 100644
--- a/src/test/regress/expected/oid.out
+++ b/src/test/regress/expected/oid.out
@@ -61,3 +61,4 @@ one| f1
|1235
(1 row)
+QUERY: DROP TABLE OID_TBL;
diff --git a/src/test/regress/expected/oidint2.out b/src/test/regress/expected/oidint2.out
index 14cb48ef9e955247bd96148bf440d97b4650d131..effcd28bb364e3dbf08f27724c75b81e09ad7b22 100644
--- a/src/test/regress/expected/oidint2.out
+++ b/src/test/regress/expected/oidint2.out
@@ -4,7 +4,7 @@ QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('1235/9873');
QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('987/-1234');
QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456');
QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('123456/123456');
-WARN:pg_atoi: error reading "123456": Math result not representable
+WARN:pg_atoi: error reading "123456": Result too large
QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('');
QUERY: INSERT INTO OIDINT2_TBL(f1) VALUES ('asdfasd');
WARN:pg_atoi: error in "asdfasd": can't parse "asdfasd"
@@ -63,3 +63,4 @@ one|f1
|123456/0
(1 row)
+QUERY: DROP TABLE OIDINT2_TBL;
diff --git a/src/test/regress/expected/oidint4.out b/src/test/regress/expected/oidint4.out
index 53f34c3462920975e04fcd9cee7ca3d71bbed604..ad3b25ee933811bb046acdaced0eab5deac7555c 100644
--- a/src/test/regress/expected/oidint4.out
+++ b/src/test/regress/expected/oidint4.out
@@ -4,7 +4,7 @@ QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('1235/9873');
QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('987/-1234');
QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456');
QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('123456/1234568901234567890');
-WARN:pg_atoi: error reading "1234568901234567890": Math result not representable
+WARN:pg_atoi: error reading "1234568901234567890": Result too large
QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('');
QUERY: INSERT INTO OIDINT4_TBL(f1) VALUES ('asdfasd');
WARN:pg_atoi: error in "asdfasd": can't parse "asdfasd"
@@ -63,3 +63,4 @@ one|f1
|123456/0
(1 row)
+QUERY: DROP TABLE OIDINT4_TBL;
diff --git a/src/test/regress/expected/oidname.out b/src/test/regress/expected/oidname.out
index eb573998166179f51fec44a81c2f46bf39428c4b..fddf7b8ce3d478c634b1fe4e32e191149f5b7374 100644
--- a/src/test/regress/expected/oidname.out
+++ b/src/test/regress/expected/oidname.out
@@ -60,3 +60,4 @@ two|f1
|123456,abcdefghijklmnopqrsutvwyz
(2 rows)
+QUERY: DROP TABLE OIDNAME_TBL;
diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out
index 4ee7cbb4240e5ffc32f1da2b0e3ee71c0d66f652..547b2f521a552966013e99622e981a04a57314e8 100644
--- a/src/test/regress/expected/point.out
+++ b/src/test/regress/expected/point.out
@@ -207,3 +207,4 @@ three|f1 |f1
|(5.1,34.5)|(10,10)
(3 rows)
+QUERY: DROP TABLE POINT_TBL;
diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source
index 3cc0bf5a83c6dfd5e2f2447da169f9ea4d356a5c..6cdc67143652ef70a012d8646a7cd75200d164bb 100644
--- a/src/test/regress/input/copy.source
+++ b/src/test/regress/input/copy.source
@@ -6,49 +6,49 @@
-- CLASS POPULATION
-- (any resemblance to real life is purely coincidental)
--
-COPY onek FROM '_CWD_/../data/onek.data';
+COPY onek FROM '_CWD_/data/onek.data';
-COPY onek TO '_OBJWD_/results/onek.data';
+COPY onek TO '_CWD_/results/onek.data';
DELETE FROM onek;
-COPY onek FROM '_OBJWD_/results/onek.data';
+COPY onek FROM '_CWD_/results/onek.data';
-COPY tenk1 FROM '_CWD_/../data/tenk.data';
+COPY tenk1 FROM '_CWD_/data/tenk.data';
-COPY slow_emp4000 FROM '_CWD_/../data/rect.data';
+COPY slow_emp4000 FROM '_CWD_/data/rect.data';
-COPY person FROM '_CWD_/../data/person.data';
+COPY person FROM '_CWD_/data/person.data';
-COPY emp FROM '_CWD_/../data/emp.data';
+COPY emp FROM '_CWD_/data/emp.data';
-COPY student FROM '_CWD_/../data/student.data';
+COPY student FROM '_CWD_/data/student.data';
-COPY stud_emp FROM '_CWD_/../data/stud_emp.data';
+COPY stud_emp FROM '_CWD_/data/stud_emp.data';
-COPY road FROM '_CWD_/../data/streets.data';
+COPY road FROM '_CWD_/data/streets.data';
-COPY real_city FROM '_CWD_/../data/real_city.data';
+COPY real_city FROM '_CWD_/data/real_city.data';
-COPY hash_i4_heap FROM '_CWD_/../data/hash.data';
+COPY hash_i4_heap FROM '_CWD_/data/hash.data';
-COPY hash_c16_heap FROM '_CWD_/../data/hash.data';
+COPY hash_c16_heap FROM '_CWD_/data/hash.data';
-COPY hash_txt_heap FROM '_CWD_/../data/hash.data';
+COPY hash_txt_heap FROM '_CWD_/data/hash.data';
-COPY hash_f8_heap FROM '_CWD_/../data/hash.data';
+COPY hash_f8_heap FROM '_CWD_/data/hash.data';
-- the data in this file has a lot of duplicates in the index key
-- fields, leading to long bucket chains and lots of table expansion.
-- this is therefore a stress test of the bucket overflow code (unlike
-- the data in hash.data, which has unique index keys).
--
--- COPY hash_ovfl_heap FROM '_CWD_/../data/hashovfl.data';
+-- COPY hash_ovfl_heap FROM '_CWD_/data/hashovfl.data';
-COPY bt_i4_heap FROM '_CWD_/../data/desc.data';
+COPY bt_i4_heap FROM '_CWD_/data/desc.data';
-COPY bt_c16_heap FROM '_CWD_/../data/hash.data';
+COPY bt_c16_heap FROM '_CWD_/data/hash.data';
-COPY bt_txt_heap FROM '_CWD_/../data/desc.data';
+COPY bt_txt_heap FROM '_CWD_/data/desc.data';
-COPY bt_f8_heap FROM '_CWD_/../data/hash.data';
+COPY bt_f8_heap FROM '_CWD_/data/hash.data';
diff --git a/src/test/regress/output/copy.source b/src/test/regress/output/copy.source
index dd620217f30ff731d6de65ecd2272be3f9343249..d2ad50bc537ad616998ae00b8ce998b2fef2ae0f 100644
--- a/src/test/regress/output/copy.source
+++ b/src/test/regress/output/copy.source
@@ -1,4 +1,7 @@
QUERY: COPY onek FROM '_CWD_/data/onek.data';
+QUERY: COPY onek TO '_CWD_/results/onek.data';
+QUERY: DELETE FROM onek;
+QUERY: COPY onek FROM '_CWD_/results/onek.data';
QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
QUERY: COPY slow_emp4000 FROM '_CWD_/data/rect.data';
QUERY: COPY person FROM '_CWD_/data/person.data';