7 files changed, 32 insertions, 27 deletions
diff --git a/src/test/regress/expected/large_object.out b/src/test/regress/expected/large_object.out
deleted file mode 100644
index b00d47cc75e..00000000000
--- a/src/test/regress/expected/large_object.out
+++ /dev/null
@@ -1,15 +0,0 @@
--- This is more-or-less DROP IF EXISTS LARGE OBJECT 3001;
-WITH unlink AS (SELECT lo_unlink(loid) FROM pg_largeobject WHERE loid = 3001) SELECT 1;
- ?column? 
-----------
-        1
-(1 row)
-
--- Test creation of a large object and leave it for testing pg_upgrade
-SELECT lo_create(3001);
- lo_create 
------------
-      3001
-(1 row)
-
-COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/input/largeobject.source
index 70b6707c70b..3c2bce1708a 100644
--- a/src/test/regress/input/largeobject.source
+++ b/src/test/regress/input/largeobject.source
@@ -211,5 +211,13 @@ SELECT pageno, data FROM pg_largeobject WHERE loid = :newloid;
 SELECT lo_unlink(loid) FROM lotest_stash_values;
 \lo_unlink :newloid
 
-TRUNCATE lotest_stash_values;
+-- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
+-- this one intentionally has an OID in the system range
+SELECT lo_create(3001);
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+
+-- Clean up
+DROP TABLE lotest_stash_values;
+
 DROP ROLE regresslo;
diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/output/largeobject.source
index 4115a882b2a..a368cdfd417 100644
--- a/src/test/regress/output/largeobject.source
+++ b/src/test/regress/output/largeobject.source
@@ -399,5 +399,15 @@ SELECT lo_unlink(loid) FROM lotest_stash_values;
 (1 row)
 
 \lo_unlink :newloid
-TRUNCATE lotest_stash_values;
+-- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
+-- this one intentionally has an OID in the system range
+SELECT lo_create(3001);
+ lo_create 
+-----------
+      3001
+(1 row)
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+-- Clean up
+DROP TABLE lotest_stash_values;
 DROP ROLE regresslo;
diff --git a/src/test/regress/output/largeobject_1.source b/src/test/regress/output/largeobject_1.source
index a2056c4cbcc..860048ee434 100644
--- a/src/test/regress/output/largeobject_1.source
+++ b/src/test/regress/output/largeobject_1.source
@@ -399,5 +399,15 @@ SELECT lo_unlink(loid) FROM lotest_stash_values;
 (1 row)
 
 \lo_unlink :newloid
-TRUNCATE lotest_stash_values;
+-- Create one more object that we leave behind for testing pg_dump/pg_upgrade;
+-- this one intentionally has an OID in the system range
+SELECT lo_create(3001);
+ lo_create 
+-----------
+      3001
+(1 row)
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';
+-- Clean up
+DROP TABLE lotest_stash_values;
 DROP ROLE regresslo;
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index b8984088bb1..4c6ce9702c5 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -83,7 +83,7 @@ test: select_into select_distinct select_distinct_on select_implicit select_havi
 # ----------
 # Another group of parallel tests
 # ----------
-test: privileges security_label collate matview large_object
+test: privileges security_label collate matview
 
 # ----------
 # Another group of parallel tests
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index dee345a5dfb..57fc93d3cda 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -96,7 +96,6 @@ test: privileges
 test: security_label
 test: collate
 test: matview
-test: large_object
 test: alter_generic
 test: misc
 test: psql
diff --git a/src/test/regress/sql/large_object.sql b/src/test/regress/sql/large_object.sql
deleted file mode 100644
index c06b393dd36..00000000000
--- a/src/test/regress/sql/large_object.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- This is more-or-less DROP IF EXISTS LARGE OBJECT 3001;
-WITH unlink AS (SELECT lo_unlink(loid) FROM pg_largeobject WHERE loid = 3001) SELECT 1;
-
--- Test creation of a large object and leave it for testing pg_upgrade
-SELECT lo_create(3001);
-
-COMMENT ON LARGE OBJECT 3001 IS 'testing comments';