diff --git a/contrib/pg_visibility/Makefile b/contrib/pg_visibility/Makefile
index e5a74f32c48..8e3434a808e 100644
--- a/contrib/pg_visibility/Makefile
+++ b/contrib/pg_visibility/Makefile
@@ -11,7 +11,7 @@ DATA = pg_visibility--1.1.sql pg_visibility--1.1--1.2.sql \
 PGFILEDESC = "pg_visibility - page visibility information"
 
 EXTRA_INSTALL = contrib/pageinspect
-REGRESS = pg_visibility
+REGRESS =  $(shell printf 'pg_visibility %.0s' `seq 100`)
 TAP_TESTS = 1
 
 ifdef USE_PGXS
diff --git a/contrib/pg_visibility/expected/pg_visibility.out b/contrib/pg_visibility/expected/pg_visibility.out
index e10f1706015..1e444558ac8 100644
--- a/contrib/pg_visibility/expected/pg_visibility.out
+++ b/contrib/pg_visibility/expected/pg_visibility.out
@@ -1,5 +1,8 @@
-CREATE EXTENSION pg_visibility;
-CREATE EXTENSION pageinspect;
+SET client_min_messages TO 'warning';
+CREATE EXTENSION IF NOT EXISTS pg_visibility;
+CREATE EXTENSION IF NOT EXISTS pageinspect;
+DROP TABLE IF EXISTS test_vac_unmodified_heap;
+RESET client_min_messages;
 --
 -- recently-dropped table
 --
diff --git a/contrib/pg_visibility/sql/pg_visibility.sql b/contrib/pg_visibility/sql/pg_visibility.sql
index 57af8a0c5b6..78fd52a0b73 100644
--- a/contrib/pg_visibility/sql/pg_visibility.sql
+++ b/contrib/pg_visibility/sql/pg_visibility.sql
@@ -1,5 +1,8 @@
-CREATE EXTENSION pg_visibility;
-CREATE EXTENSION pageinspect;
+SET client_min_messages TO 'warning';
+CREATE EXTENSION IF NOT EXISTS pg_visibility;
+CREATE EXTENSION IF NOT EXISTS pageinspect;
+DROP TABLE IF EXISTS test_vac_unmodified_heap;
+RESET client_min_messages;
 
 --
 -- recently-dropped table